Skip to content

Commit 33db485

Browse files
jellejurrejellejurre
authored
Merge pull request #11 from C0D3-M4513R/feat/upgrade-gen
Update generator
2 parents ebaa14b + 4fe49a5 commit 33db485

462 files changed

Lines changed: 37000 additions & 37808 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: npm install @openapitools/openapi-generator-cli
4545

4646
- name: Set OpenAPI Generator version
47-
run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 6.2.1
47+
run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 7.24.0
4848

4949
- name: Download Specification
5050
run: wget "${SPEC_URL}" '--output-document' "${ARTIFACT_NAME}"

‎.github/workflows/maven.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
java: [ '8' ]
20+
java: [ 17, 21 ]
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- name: Set up JDK
24-
uses: actions/setup-java@v3
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: ${{ matrix.java }}
2727
distribution: 'temurin'

‎.openapi-generator/FILES‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ docs/InstancesApi.md
172172
docs/Inventory.md
173173
docs/InventoryApi.md
174174
docs/InventoryConsumptionResults.md
175-
docs/InventoryDefaultAttributes1.md
176-
docs/InventoryDefaultAttributes1Validator.md
175+
docs/InventoryDefaultAttributesValue.md
176+
docs/InventoryDefaultAttributesValueValidator.md
177177
docs/InventoryDrop.md
178178
docs/InventoryEquipSlot.md
179179
docs/InventoryFlag.md
@@ -214,13 +214,21 @@ docs/ModerationReport.md
214214
docs/MutualFriend.md
215215
docs/Mutuals.md
216216
docs/Notification.md
217+
docs/NotificationDetailBoop.md
217218
docs/NotificationDetailInvite.md
218219
docs/NotificationDetailInviteResponse.md
219220
docs/NotificationDetailRequestInvite.md
220221
docs/NotificationDetailRequestInviteResponse.md
221222
docs/NotificationDetailVoteToKick.md
222223
docs/NotificationType.md
223224
docs/NotificationV2.md
225+
docs/NotificationV2Data.md
226+
docs/NotificationV2DataBadgeEarned.md
227+
docs/NotificationV2DataBoop.md
228+
docs/NotificationV2DataEventAnnouncement.md
229+
docs/NotificationV2DataGroupAnnouncement.md
230+
docs/NotificationV2DataGroupInformative.md
231+
docs/NotificationV2DataGroupTransfer.md
224232
docs/NotificationV2DetailsBoop.md
225233
docs/NotificationV2Response.md
226234
docs/NotificationV2Type.md
@@ -245,6 +253,8 @@ docs/PlayermoderationApi.md
245253
docs/Print.md
246254
docs/PrintFiles.md
247255
docs/PrintsApi.md
256+
docs/PrivateProfile.md
257+
docs/PrivateProfileActivity.md
248258
docs/Product.md
249259
docs/ProductListing.md
250260
docs/ProductListingType.md
@@ -256,20 +266,24 @@ docs/ProductPurchaseProduct.md
256266
docs/ProductPurchasePurchaseContext.md
257267
docs/ProductPurchaseRecord.md
258268
docs/ProductType.md
269+
docs/ProfileRepresentedGroup.md
259270
docs/Prop.md
260271
docs/PropPublishStatus.md
261272
docs/PropUnityPackage.md
262273
docs/PropsApi.md
274+
docs/PublicProfile.md
263275
docs/PurchaseContextData.md
264276
docs/PurchaseProductListingRequest.md
265277
docs/Region.md
278+
docs/RegisterUserAccount200Response.md
266279
docs/RegisterUserAccountRequest.md
267280
docs/ReleaseStatus.md
268281
docs/ReportCategory.md
269282
docs/ReportReason.md
270283
docs/RepresentedGroup.md
271284
docs/RequestInviteRequest.md
272285
docs/RequestInviteWithPhotoRequest.md
286+
docs/RequiresTwoFactorAuth.md
273287
docs/RespondGroupJoinRequest.md
274288
docs/RespondInviteWithPhotoRequest.md
275289
docs/RespondNotificationV2Request.md
@@ -282,6 +296,7 @@ docs/RewardRedemptionResult.md
282296
docs/SearchGroupMembers200Response.md
283297
docs/SellerEligibility.md
284298
docs/SentNotification.md
299+
docs/SentNotificationDetails.md
285300
docs/ServiceQueueStats.md
286301
docs/ServiceStatus.md
287302
docs/ShareInventoryItemDirectRequest.md
@@ -310,6 +325,7 @@ docs/TransactionSteamWalletInfo.md
310325
docs/TransferGroupRequest.md
311326
docs/TutorialStatus.md
312327
docs/TwoFactorAuthCode.md
328+
docs/TwoFactorAuthType.md
313329
docs/TwoFactorEmailCode.md
314330
docs/TwoFactorRecoveryCodes.md
315331
docs/TwoFactorRecoveryCodesOtpInner.md
@@ -559,8 +575,8 @@ src/main/java/io/github/vrchatapi/model/InstanceShortNameResponse.java
559575
src/main/java/io/github/vrchatapi/model/InstanceType.java
560576
src/main/java/io/github/vrchatapi/model/Inventory.java
561577
src/main/java/io/github/vrchatapi/model/InventoryConsumptionResults.java
562-
src/main/java/io/github/vrchatapi/model/InventoryDefaultAttributes1.java
563-
src/main/java/io/github/vrchatapi/model/InventoryDefaultAttributes1Validator.java
578+
src/main/java/io/github/vrchatapi/model/InventoryDefaultAttributesValue.java
579+
src/main/java/io/github/vrchatapi/model/InventoryDefaultAttributesValueValidator.java
564580
src/main/java/io/github/vrchatapi/model/InventoryDrop.java
565581
src/main/java/io/github/vrchatapi/model/InventoryEquipSlot.java
566582
src/main/java/io/github/vrchatapi/model/InventoryFlag.java
@@ -598,13 +614,21 @@ src/main/java/io/github/vrchatapi/model/ModerationReport.java
598614
src/main/java/io/github/vrchatapi/model/MutualFriend.java
599615
src/main/java/io/github/vrchatapi/model/Mutuals.java
600616
src/main/java/io/github/vrchatapi/model/Notification.java
617+
src/main/java/io/github/vrchatapi/model/NotificationDetailBoop.java
601618
src/main/java/io/github/vrchatapi/model/NotificationDetailInvite.java
602619
src/main/java/io/github/vrchatapi/model/NotificationDetailInviteResponse.java
603620
src/main/java/io/github/vrchatapi/model/NotificationDetailRequestInvite.java
604621
src/main/java/io/github/vrchatapi/model/NotificationDetailRequestInviteResponse.java
605622
src/main/java/io/github/vrchatapi/model/NotificationDetailVoteToKick.java
606623
src/main/java/io/github/vrchatapi/model/NotificationType.java
607624
src/main/java/io/github/vrchatapi/model/NotificationV2.java
625+
src/main/java/io/github/vrchatapi/model/NotificationV2Data.java
626+
src/main/java/io/github/vrchatapi/model/NotificationV2DataBadgeEarned.java
627+
src/main/java/io/github/vrchatapi/model/NotificationV2DataBoop.java
628+
src/main/java/io/github/vrchatapi/model/NotificationV2DataEventAnnouncement.java
629+
src/main/java/io/github/vrchatapi/model/NotificationV2DataGroupAnnouncement.java
630+
src/main/java/io/github/vrchatapi/model/NotificationV2DataGroupInformative.java
631+
src/main/java/io/github/vrchatapi/model/NotificationV2DataGroupTransfer.java
608632
src/main/java/io/github/vrchatapi/model/NotificationV2DetailsBoop.java
609633
src/main/java/io/github/vrchatapi/model/NotificationV2Response.java
610634
src/main/java/io/github/vrchatapi/model/NotificationV2Type.java
@@ -626,6 +650,8 @@ src/main/java/io/github/vrchatapi/model/PlayerModeration.java
626650
src/main/java/io/github/vrchatapi/model/PlayerModerationType.java
627651
src/main/java/io/github/vrchatapi/model/Print.java
628652
src/main/java/io/github/vrchatapi/model/PrintFiles.java
653+
src/main/java/io/github/vrchatapi/model/PrivateProfile.java
654+
src/main/java/io/github/vrchatapi/model/PrivateProfileActivity.java
629655
src/main/java/io/github/vrchatapi/model/Product.java
630656
src/main/java/io/github/vrchatapi/model/ProductListing.java
631657
src/main/java/io/github/vrchatapi/model/ProductListingType.java
@@ -637,19 +663,23 @@ src/main/java/io/github/vrchatapi/model/ProductPurchaseProduct.java
637663
src/main/java/io/github/vrchatapi/model/ProductPurchasePurchaseContext.java
638664
src/main/java/io/github/vrchatapi/model/ProductPurchaseRecord.java
639665
src/main/java/io/github/vrchatapi/model/ProductType.java
666+
src/main/java/io/github/vrchatapi/model/ProfileRepresentedGroup.java
640667
src/main/java/io/github/vrchatapi/model/Prop.java
641668
src/main/java/io/github/vrchatapi/model/PropPublishStatus.java
642669
src/main/java/io/github/vrchatapi/model/PropUnityPackage.java
670+
src/main/java/io/github/vrchatapi/model/PublicProfile.java
643671
src/main/java/io/github/vrchatapi/model/PurchaseContextData.java
644672
src/main/java/io/github/vrchatapi/model/PurchaseProductListingRequest.java
645673
src/main/java/io/github/vrchatapi/model/Region.java
674+
src/main/java/io/github/vrchatapi/model/RegisterUserAccount200Response.java
646675
src/main/java/io/github/vrchatapi/model/RegisterUserAccountRequest.java
647676
src/main/java/io/github/vrchatapi/model/ReleaseStatus.java
648677
src/main/java/io/github/vrchatapi/model/ReportCategory.java
649678
src/main/java/io/github/vrchatapi/model/ReportReason.java
650679
src/main/java/io/github/vrchatapi/model/RepresentedGroup.java
651680
src/main/java/io/github/vrchatapi/model/RequestInviteRequest.java
652681
src/main/java/io/github/vrchatapi/model/RequestInviteWithPhotoRequest.java
682+
src/main/java/io/github/vrchatapi/model/RequiresTwoFactorAuth.java
653683
src/main/java/io/github/vrchatapi/model/RespondGroupJoinRequest.java
654684
src/main/java/io/github/vrchatapi/model/RespondInviteWithPhotoRequest.java
655685
src/main/java/io/github/vrchatapi/model/RespondNotificationV2Request.java
@@ -662,6 +692,7 @@ src/main/java/io/github/vrchatapi/model/RewardRedemptionResult.java
662692
src/main/java/io/github/vrchatapi/model/SearchGroupMembers200Response.java
663693
src/main/java/io/github/vrchatapi/model/SellerEligibility.java
664694
src/main/java/io/github/vrchatapi/model/SentNotification.java
695+
src/main/java/io/github/vrchatapi/model/SentNotificationDetails.java
665696
src/main/java/io/github/vrchatapi/model/ServiceQueueStats.java
666697
src/main/java/io/github/vrchatapi/model/ServiceStatus.java
667698
src/main/java/io/github/vrchatapi/model/ShareInventoryItemDirectRequest.java
@@ -690,6 +721,7 @@ src/main/java/io/github/vrchatapi/model/TransactionSteamWalletInfo.java
690721
src/main/java/io/github/vrchatapi/model/TransferGroupRequest.java
691722
src/main/java/io/github/vrchatapi/model/TutorialStatus.java
692723
src/main/java/io/github/vrchatapi/model/TwoFactorAuthCode.java
724+
src/main/java/io/github/vrchatapi/model/TwoFactorAuthType.java
693725
src/main/java/io/github/vrchatapi/model/TwoFactorEmailCode.java
694726
src/main/java/io/github/vrchatapi/model/TwoFactorRecoveryCodes.java
695727
src/main/java/io/github/vrchatapi/model/TwoFactorRecoveryCodesOtpInner.java

‎.openapi-generator/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.2.1
1+
7.24.0

‎build.gradle‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'java'
44
apply plugin: 'com.diffplug.spotless'
55

66
group = 'io.github.vrchatapi'
7-
version = '1.20.7'
7+
version = '1.20.8-nightly.20'
88

99
buildscript {
1010
repositories {
@@ -62,9 +62,9 @@ if(hasProperty('target') && target == 'android') {
6262
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
6363
task.description = "Create jar artifact for ${variant.name}"
6464
task.dependsOn variant.javaCompile
65-
task.from variant.javaCompile.destinationDir
66-
task.destinationDir = project.file("${project.buildDir}/outputs/jar")
67-
task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
65+
task.from variant.javaCompile.destinationDirectory
66+
task.destinationDirectory = project.file("${project.buildDir}/outputs/jar")
67+
task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar"
6868
artifacts.add('archives', task)
6969
}
7070
}
@@ -106,20 +106,18 @@ ext {
106106
}
107107

108108
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
110109
implementation "com.google.code.findbugs:jsr305:3.0.2"
111-
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
112-
implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
110+
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
111+
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
113112
implementation 'com.google.code.gson:gson:2.9.1'
114-
implementation 'io.gsonfire:gson-fire:1.8.5'
115-
implementation 'javax.ws.rs:jsr311-api:1.1.1'
116-
implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
117-
implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
118-
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
113+
implementation 'io.gsonfire:gson-fire:1.9.0'
114+
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
115+
implementation 'org.openapitools:jackson-databind-nullable:0.2.10'
116+
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.18.0'
119117
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
120-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
118+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
121119
testImplementation 'org.mockito:mockito-core:3.12.4'
122-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
120+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
123121
}
124122

125123
javadoc {

‎build.sbt‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "io.github.vrchatapi",
44
name := "vrchatapi",
5-
version := "1.20.7",
6-
scalaVersion := "2.11.4",
5+
version := "1.20.8-nightly.20",
6+
scalaVersion := "2.11.12",
77
scalacOptions ++= Seq("-feature"),
8-
javacOptions in compile ++= Seq("-Xlint:deprecation"),
9-
publishArtifact in (Compile, packageDoc) := false,
8+
compile / javacOptions ++= Seq("-Xlint:deprecation"),
9+
Compile / packageDoc / publishArtifact := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.6.5",
13-
"com.squareup.okhttp3" % "okhttp" % "4.10.0",
14-
"com.squareup.okhttp3" % "logging-interceptor" % "4.10.0",
13+
"com.squareup.okhttp3" % "okhttp" % "4.12.0",
14+
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
1515
"com.google.code.gson" % "gson" % "2.9.1",
16-
"org.apache.commons" % "commons-lang3" % "3.12.0",
17-
"javax.ws.rs" % "jsr311-api" % "1.1.1",
18-
"javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
19-
"org.openapitools" % "jackson-databind-nullable" % "0.2.4",
20-
"io.gsonfire" % "gson-fire" % "1.8.5" % "compile",
16+
"org.apache.commons" % "commons-lang3" % "3.18.0",
17+
"jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
18+
"org.openapitools" % "jackson-databind-nullable" % "0.2.10",
19+
"io.gsonfire" % "gson-fire" % "1.9.0" % "compile",
2120
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
2221
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
2322
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
24-
"org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
23+
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
2524
"com.novocode" % "junit-interface" % "0.10" % "test",
2625
"org.mockito" % "mockito-core" % "3.12.4" % "test"
2726
)

0 commit comments

Comments
 (0)