Skip to content

Commit 4ac974e

Browse files
VRCCatVRCCat
committed
Upgrade Java SDK to spec 1.9.1
1 parent 388ad03 commit 4ac974e

254 files changed

Lines changed: 19596 additions & 15548 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.

‎.openapi-generator/FILES‎

Lines changed: 70 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1-
.github/workflows/maven.yml
21
api/openapi.yaml
32
build.gradle
43
build.sbt
54
docs/APIConfig.md
6-
docs/APIEventConfig.md
5+
docs/APIConfigAnnouncement.md
6+
docs/APIConfigDownloadURLList.md
7+
docs/APIConfigEvents.md
78
docs/APIHealth.md
89
docs/AddFavoriteRequest.md
10+
docs/AddGroupGalleryImageRequest.md
911
docs/AuthenticationApi.md
1012
docs/Avatar.md
1113
docs/AvatarUnityPackageUrlObject.md
1214
docs/AvatarsApi.md
15+
docs/BanGroupMemberRequest.md
1316
docs/CreateAvatarRequest.md
1417
docs/CreateFileRequest.md
1518
docs/CreateFileVersionRequest.md
19+
docs/CreateGroupAnnouncementRequest.md
20+
docs/CreateGroupGalleryRequest.md
21+
docs/CreateGroupInviteRequest.md
22+
docs/CreateGroupRequest.md
23+
docs/CreateGroupRoleRequest.md
1624
docs/CreateWorldRequest.md
1725
docs/CurrentUser.md
1826
docs/DeploymentGroup.md
1927
docs/DeveloperType.md
20-
docs/DownloadURLList.md
2128
docs/DynamicContentRow.md
2229
docs/EconomyApi.md
2330
docs/Error.md
@@ -35,6 +42,23 @@ docs/FilesApi.md
3542
docs/FinishFileDataUploadRequest.md
3643
docs/FriendStatus.md
3744
docs/FriendsApi.md
45+
docs/Group.md
46+
docs/GroupAnnouncement.md
47+
docs/GroupAuditLogEntry.md
48+
docs/GroupGallery.md
49+
docs/GroupGalleryImage.md
50+
docs/GroupJoinState.md
51+
docs/GroupLimitedMember.md
52+
docs/GroupMember.md
53+
docs/GroupMemberLimitedUser.md
54+
docs/GroupMemberStatus.md
55+
docs/GroupMyMember.md
56+
docs/GroupPermission.md
57+
docs/GroupPrivacy.md
58+
docs/GroupRole.md
59+
docs/GroupRoleTemplate.md
60+
docs/GroupUserVisibility.md
61+
docs/GroupsApi.md
3862
docs/InfoPush.md
3963
docs/InfoPushData.md
4064
docs/InfoPushDataArticle.md
@@ -58,23 +82,25 @@ docs/LimitedUnityPackage.md
5882
docs/LimitedUser.md
5983
docs/LimitedWorld.md
6084
docs/MIMEType.md
61-
docs/ModelFile.md
6285
docs/ModerateUserRequest.md
6386
docs/Notification.md
6487
docs/NotificationType.md
6588
docs/NotificationsApi.md
89+
docs/OrderOption.md
90+
docs/PaginatedGroupAuditLogEntryList.md
6691
docs/PastDisplayName.md
6792
docs/Permission.md
6893
docs/PermissionsApi.md
6994
docs/PlayerModeration.md
7095
docs/PlayerModerationType.md
7196
docs/PlayermoderationApi.md
72-
docs/PublicAnnouncement.md
7397
docs/Region.md
7498
docs/ReleaseStatus.md
7599
docs/RequestInviteRequest.md
100+
docs/RespondGroupJoinRequest.md
76101
docs/Response.md
77102
docs/SentNotification.md
103+
docs/SortOption.md
78104
docs/Subscription.md
79105
docs/SubscriptionPeriod.md
80106
docs/Success.md
@@ -88,6 +114,10 @@ docs/TwoFactorAuthCode.md
88114
docs/UnityPackage.md
89115
docs/UpdateAvatarRequest.md
90116
docs/UpdateFavoriteGroupRequest.md
117+
docs/UpdateGroupGalleryRequest.md
118+
docs/UpdateGroupMemberRequest.md
119+
docs/UpdateGroupRequest.md
120+
docs/UpdateGroupRoleRequest.md
91121
docs/UpdateInviteMessageRequest.md
92122
docs/UpdateUserRequest.md
93123
docs/UpdateWorldRequest.md
@@ -131,6 +161,7 @@ src/main/java/io/github/vrchatapi/api/EconomyApi.java
131161
src/main/java/io/github/vrchatapi/api/FavoritesApi.java
132162
src/main/java/io/github/vrchatapi/api/FilesApi.java
133163
src/main/java/io/github/vrchatapi/api/FriendsApi.java
164+
src/main/java/io/github/vrchatapi/api/GroupsApi.java
134165
src/main/java/io/github/vrchatapi/api/InstancesApi.java
135166
src/main/java/io/github/vrchatapi/api/InviteApi.java
136167
src/main/java/io/github/vrchatapi/api/NotificationsApi.java
@@ -144,20 +175,27 @@ src/main/java/io/github/vrchatapi/auth/Authentication.java
144175
src/main/java/io/github/vrchatapi/auth/HttpBasicAuth.java
145176
src/main/java/io/github/vrchatapi/auth/HttpBearerAuth.java
146177
src/main/java/io/github/vrchatapi/model/APIConfig.java
147-
src/main/java/io/github/vrchatapi/model/APIEventConfig.java
178+
src/main/java/io/github/vrchatapi/model/APIConfigAnnouncement.java
179+
src/main/java/io/github/vrchatapi/model/APIConfigDownloadURLList.java
180+
src/main/java/io/github/vrchatapi/model/APIConfigEvents.java
148181
src/main/java/io/github/vrchatapi/model/APIHealth.java
149-
src/main/java/io/github/vrchatapi/model/AbstractOpenApiSchema.java
150182
src/main/java/io/github/vrchatapi/model/AddFavoriteRequest.java
183+
src/main/java/io/github/vrchatapi/model/AddGroupGalleryImageRequest.java
151184
src/main/java/io/github/vrchatapi/model/Avatar.java
152185
src/main/java/io/github/vrchatapi/model/AvatarUnityPackageUrlObject.java
186+
src/main/java/io/github/vrchatapi/model/BanGroupMemberRequest.java
153187
src/main/java/io/github/vrchatapi/model/CreateAvatarRequest.java
154188
src/main/java/io/github/vrchatapi/model/CreateFileRequest.java
155189
src/main/java/io/github/vrchatapi/model/CreateFileVersionRequest.java
190+
src/main/java/io/github/vrchatapi/model/CreateGroupAnnouncementRequest.java
191+
src/main/java/io/github/vrchatapi/model/CreateGroupGalleryRequest.java
192+
src/main/java/io/github/vrchatapi/model/CreateGroupInviteRequest.java
193+
src/main/java/io/github/vrchatapi/model/CreateGroupRequest.java
194+
src/main/java/io/github/vrchatapi/model/CreateGroupRoleRequest.java
156195
src/main/java/io/github/vrchatapi/model/CreateWorldRequest.java
157196
src/main/java/io/github/vrchatapi/model/CurrentUser.java
158197
src/main/java/io/github/vrchatapi/model/DeploymentGroup.java
159198
src/main/java/io/github/vrchatapi/model/DeveloperType.java
160-
src/main/java/io/github/vrchatapi/model/DownloadURLList.java
161199
src/main/java/io/github/vrchatapi/model/DynamicContentRow.java
162200
src/main/java/io/github/vrchatapi/model/Error.java
163201
src/main/java/io/github/vrchatapi/model/Favorite.java
@@ -171,6 +209,22 @@ src/main/java/io/github/vrchatapi/model/FileVersion.java
171209
src/main/java/io/github/vrchatapi/model/FileVersionUploadStatus.java
172210
src/main/java/io/github/vrchatapi/model/FinishFileDataUploadRequest.java
173211
src/main/java/io/github/vrchatapi/model/FriendStatus.java
212+
src/main/java/io/github/vrchatapi/model/Group.java
213+
src/main/java/io/github/vrchatapi/model/GroupAnnouncement.java
214+
src/main/java/io/github/vrchatapi/model/GroupAuditLogEntry.java
215+
src/main/java/io/github/vrchatapi/model/GroupGallery.java
216+
src/main/java/io/github/vrchatapi/model/GroupGalleryImage.java
217+
src/main/java/io/github/vrchatapi/model/GroupJoinState.java
218+
src/main/java/io/github/vrchatapi/model/GroupLimitedMember.java
219+
src/main/java/io/github/vrchatapi/model/GroupMember.java
220+
src/main/java/io/github/vrchatapi/model/GroupMemberLimitedUser.java
221+
src/main/java/io/github/vrchatapi/model/GroupMemberStatus.java
222+
src/main/java/io/github/vrchatapi/model/GroupMyMember.java
223+
src/main/java/io/github/vrchatapi/model/GroupPermission.java
224+
src/main/java/io/github/vrchatapi/model/GroupPrivacy.java
225+
src/main/java/io/github/vrchatapi/model/GroupRole.java
226+
src/main/java/io/github/vrchatapi/model/GroupRoleTemplate.java
227+
src/main/java/io/github/vrchatapi/model/GroupUserVisibility.java
174228
src/main/java/io/github/vrchatapi/model/InfoPush.java
175229
src/main/java/io/github/vrchatapi/model/InfoPushData.java
176230
src/main/java/io/github/vrchatapi/model/InfoPushDataArticle.java
@@ -192,20 +246,22 @@ src/main/java/io/github/vrchatapi/model/LimitedUnityPackage.java
192246
src/main/java/io/github/vrchatapi/model/LimitedUser.java
193247
src/main/java/io/github/vrchatapi/model/LimitedWorld.java
194248
src/main/java/io/github/vrchatapi/model/MIMEType.java
195-
src/main/java/io/github/vrchatapi/model/ModelFile.java
196249
src/main/java/io/github/vrchatapi/model/ModerateUserRequest.java
197250
src/main/java/io/github/vrchatapi/model/Notification.java
198251
src/main/java/io/github/vrchatapi/model/NotificationType.java
252+
src/main/java/io/github/vrchatapi/model/OrderOption.java
253+
src/main/java/io/github/vrchatapi/model/PaginatedGroupAuditLogEntryList.java
199254
src/main/java/io/github/vrchatapi/model/PastDisplayName.java
200255
src/main/java/io/github/vrchatapi/model/Permission.java
201256
src/main/java/io/github/vrchatapi/model/PlayerModeration.java
202257
src/main/java/io/github/vrchatapi/model/PlayerModerationType.java
203-
src/main/java/io/github/vrchatapi/model/PublicAnnouncement.java
204258
src/main/java/io/github/vrchatapi/model/Region.java
205259
src/main/java/io/github/vrchatapi/model/ReleaseStatus.java
206260
src/main/java/io/github/vrchatapi/model/RequestInviteRequest.java
261+
src/main/java/io/github/vrchatapi/model/RespondGroupJoinRequest.java
207262
src/main/java/io/github/vrchatapi/model/Response.java
208263
src/main/java/io/github/vrchatapi/model/SentNotification.java
264+
src/main/java/io/github/vrchatapi/model/SortOption.java
209265
src/main/java/io/github/vrchatapi/model/Subscription.java
210266
src/main/java/io/github/vrchatapi/model/SubscriptionPeriod.java
211267
src/main/java/io/github/vrchatapi/model/Success.java
@@ -218,6 +274,10 @@ src/main/java/io/github/vrchatapi/model/TwoFactorAuthCode.java
218274
src/main/java/io/github/vrchatapi/model/UnityPackage.java
219275
src/main/java/io/github/vrchatapi/model/UpdateAvatarRequest.java
220276
src/main/java/io/github/vrchatapi/model/UpdateFavoriteGroupRequest.java
277+
src/main/java/io/github/vrchatapi/model/UpdateGroupGalleryRequest.java
278+
src/main/java/io/github/vrchatapi/model/UpdateGroupMemberRequest.java
279+
src/main/java/io/github/vrchatapi/model/UpdateGroupRequest.java
280+
src/main/java/io/github/vrchatapi/model/UpdateGroupRoleRequest.java
221281
src/main/java/io/github/vrchatapi/model/UpdateInviteMessageRequest.java
222282
src/main/java/io/github/vrchatapi/model/UpdateUserRequest.java
223283
src/main/java/io/github/vrchatapi/model/UpdateWorldRequest.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+
5.3.0

‎build.gradle‎

Lines changed: 12 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apply plugin: 'idea'
22
apply plugin: 'eclipse'
33
apply plugin: 'java'
4-
apply plugin: 'com.diffplug.spotless'
54

65
group = 'io.github.vrchatapi'
76
version = '1.9.1'
@@ -12,8 +11,7 @@ buildscript {
1211
}
1312
dependencies {
1413
classpath 'com.android.tools.build:gradle:2.3.+'
15-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
16-
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
14+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1715
}
1816
}
1917

@@ -65,7 +63,7 @@ if(hasProperty('target') && target == 'android') {
6563
task.from variant.javaCompile.destinationDir
6664
task.destinationDir = project.file("${project.buildDir}/outputs/jar")
6765
task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
68-
artifacts.add('archives', task)
66+
artifacts.add('archives', task);
6967
}
7068
}
7169

@@ -106,63 +104,20 @@ ext {
106104
}
107105

108106
dependencies {
109-
implementation 'io.swagger:swagger-annotations:1.6.8'
107+
implementation 'io.swagger:swagger-annotations:1.5.24'
110108
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'
113-
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'
109+
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
110+
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
111+
implementation 'com.google.code.gson:gson:2.8.6'
112+
implementation 'io.gsonfire:gson-fire:1.8.4'
113+
implementation 'org.openapitools:jackson-databind-nullable:0.2.1'
114+
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
115+
implementation 'org.threeten:threetenbp:1.4.3'
119116
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
120-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
121-
testImplementation 'org.mockito:mockito-core:3.12.4'
122-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
117+
testImplementation 'junit:junit:4.13.1'
118+
testImplementation 'org.mockito:mockito-core:3.11.2'
123119
}
124120

125121
javadoc {
126122
options.tags = [ "http.response.details:a:Http Response Details" ]
127123
}
128-
129-
// Use spotless plugin to automatically format code, remove unused import, etc
130-
// To apply changes directly to the file, run `gradlew spotlessApply`
131-
// Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
132-
spotless {
133-
// comment out below to run spotless as part of the `check` task
134-
enforceCheck false
135-
136-
format 'misc', {
137-
// define the files (e.g. '*.gradle', '*.md') to apply `misc` to
138-
target '.gitignore'
139-
140-
// define the steps to apply to those files
141-
trimTrailingWhitespace()
142-
indentWithSpaces() // Takes an integer argument if you don't like 4
143-
endWithNewline()
144-
}
145-
java {
146-
// don't need to set target, it is inferred from java
147-
148-
// apply a specific flavor of google-java-format
149-
googleJavaFormat('1.8').aosp().reflowLongStrings()
150-
151-
removeUnusedImports()
152-
importOrder()
153-
}
154-
}
155-
156-
test {
157-
// Enable JUnit 5 (Gradle 4.6+).
158-
useJUnitPlatform()
159-
160-
// Always run tests, even when nothing changed.
161-
dependsOn 'cleanTest'
162-
163-
// Show test results.
164-
testLogging {
165-
events "passed", "skipped", "failed"
166-
}
167-
168-
}

‎build.sbt‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@ lazy val root = (project in file(".")).
99
publishArtifact in (Compile, packageDoc) := false,
1010
resolvers += Resolver.mavenLocal,
1111
libraryDependencies ++= Seq(
12-
"io.swagger" % "swagger-annotations" % "1.6.5",
13-
"com.squareup.okhttp3" % "okhttp" % "4.10.0",
14-
"com.squareup.okhttp3" % "logging-interceptor" % "4.10.0",
15-
"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",
12+
"io.swagger" % "swagger-annotations" % "1.5.24",
13+
"com.squareup.okhttp3" % "okhttp" % "4.9.1",
14+
"com.squareup.okhttp3" % "logging-interceptor" % "4.9.1",
15+
"com.google.code.gson" % "gson" % "2.8.6",
16+
"org.apache.commons" % "commons-lang3" % "3.10",
17+
"org.openapitools" % "jackson-databind-nullable" % "0.2.1",
18+
"org.threeten" % "threetenbp" % "1.4.3" % "compile",
19+
"io.gsonfire" % "gson-fire" % "1.8.3" % "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",
25-
"com.novocode" % "junit-interface" % "0.10" % "test",
26-
"org.mockito" % "mockito-core" % "3.12.4" % "test"
23+
"junit" % "junit" % "4.13.1" % "test",
24+
"com.novocode" % "junit-interface" % "0.10" % "test"
2725
)
2826
)

0 commit comments

Comments
 (0)