Skip to content

Commit d389908

Browse files
FoorackFoorack
committed
Upgrade Java SDK to spec 1.4.2
1 parent 6d39d13 commit d389908

20 files changed

Lines changed: 210 additions & 155 deletions

‎.openapi-generator/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.1
1+
5.3.0

‎build.gradle‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ version = '1.4.2'
77

88
buildscript {
99
repositories {
10-
maven { url "https://repo1.maven.org/maven2" }
11-
jcenter()
10+
mavenCentral()
1211
}
1312
dependencies {
1413
classpath 'com.android.tools.build:gradle:2.3.+'
@@ -17,7 +16,7 @@ buildscript {
1716
}
1817

1918
repositories {
20-
jcenter()
19+
mavenCentral()
2120
}
2221
sourceSets {
2322
main.java.srcDirs = ['src/main/java']
@@ -52,7 +51,7 @@ if(hasProperty('target') && target == 'android') {
5251
}
5352

5453
dependencies {
55-
provided 'javax.annotation:javax.annotation-api:1.3.2'
54+
provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
5655
}
5756
}
5857

@@ -80,14 +79,17 @@ if(hasProperty('target') && target == 'android') {
8079
} else {
8180

8281
apply plugin: 'java'
83-
apply plugin: 'maven'
82+
apply plugin: 'maven-publish'
8483

8584
sourceCompatibility = JavaVersion.VERSION_1_8
8685
targetCompatibility = JavaVersion.VERSION_1_8
8786

88-
install {
89-
repositories.mavenInstaller {
90-
pom.artifactId = 'vrchatapi'
87+
publishing {
88+
publications {
89+
maven(MavenPublication) {
90+
artifactId = 'vrchatapi'
91+
from components.java
92+
}
9193
}
9294
}
9395

@@ -97,6 +99,10 @@ if(hasProperty('target') && target == 'android') {
9799
}
98100
}
99101

102+
ext {
103+
jakarta_annotation_version = "1.3.5"
104+
}
105+
100106
dependencies {
101107
implementation 'io.swagger:swagger-annotations:1.5.24'
102108
implementation "com.google.code.findbugs:jsr305:3.0.2"
@@ -107,8 +113,9 @@ dependencies {
107113
implementation 'org.openapitools:jackson-databind-nullable:0.2.1'
108114
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
109115
implementation 'org.threeten:threetenbp:1.4.3'
110-
implementation 'javax.annotation:javax.annotation-api:1.3.2'
116+
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
111117
testImplementation 'junit:junit:4.13.1'
118+
testImplementation 'org.mockito:mockito-core:3.11.2'
112119
}
113120

114121
javadoc {

‎build.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ lazy val root = (project in file(".")).
1717
"org.openapitools" % "jackson-databind-nullable" % "0.2.1",
1818
"org.threeten" % "threetenbp" % "1.4.3" % "compile",
1919
"io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
20-
"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
20+
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
2121
"com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
22-
"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
22+
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
2323
"junit" % "junit" % "4.13.1" % "test",
2424
"com.novocode" % "junit-interface" % "0.10" % "test"
2525
)

‎docs/AvatarsApi.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ public class Example {
282282
String featured = "featured_example"; // String | Filters on featured results.
283283
String sort = "popularity"; // String |
284284
Integer n = 60; // Integer | The number of objects to return.
285-
String order = "descending"; // String |
285+
String order = "ascending"; // String |
286286
Integer offset = 56; // Integer | A zero-based offset from the default object sorting from where search results start.
287287
String search = "search_example"; // String | Filters by world name.
288288
String tag = "tag_example"; // String | Tags to include (comma-separated).
@@ -382,10 +382,10 @@ public class Example {
382382
AvatarsApi apiInstance = new AvatarsApi(defaultClient);
383383
String featured = "featured_example"; // String | Filters on featured results.
384384
String sort = "popularity"; // String |
385-
String user = "user_example"; // String | Set to `me` for searching own avatars.
385+
String user = "me"; // String | Set to `me` for searching own avatars.
386386
String userId = "userId_example"; // String | Filter by UserID.
387387
Integer n = 60; // Integer | The number of objects to return.
388-
String order = "descending"; // String |
388+
String order = "ascending"; // String |
389389
Integer offset = 56; // Integer | A zero-based offset from the default object sorting from where search results start.
390390
String tag = "tag_example"; // String | Tags to include (comma-separated).
391391
String notag = "notag_example"; // String | Tags to exclude (comma-separated).

‎docs/FavoritesApi.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public class Example {
127127
//authCookie.setApiKeyPrefix("Token");
128128

129129
FavoritesApi apiInstance = new FavoritesApi(defaultClient);
130-
String favoriteGroupType = "favoriteGroupType_example"; // String | The type of group to fetch, must be a valid FavoriteType.
130+
String favoriteGroupType = "world"; // String | The type of group to fetch, must be a valid FavoriteType.
131131
String favoriteGroupName = "favoriteGroupName_example"; // String |
132132
String userId = "userId_example"; // String |
133133
try {
@@ -283,7 +283,7 @@ public class Example {
283283
//authCookie.setApiKeyPrefix("Token");
284284

285285
FavoritesApi apiInstance = new FavoritesApi(defaultClient);
286-
String favoriteGroupType = "favoriteGroupType_example"; // String | The type of group to fetch, must be a valid FavoriteType.
286+
String favoriteGroupType = "world"; // String | The type of group to fetch, must be a valid FavoriteType.
287287
String favoriteGroupName = "favoriteGroupName_example"; // String |
288288
String userId = "userId_example"; // String |
289289
try {
@@ -601,7 +601,7 @@ public class Example {
601601
//authCookie.setApiKeyPrefix("Token");
602602

603603
FavoritesApi apiInstance = new FavoritesApi(defaultClient);
604-
String favoriteGroupType = "favoriteGroupType_example"; // String | The type of group to fetch, must be a valid FavoriteType.
604+
String favoriteGroupType = "world"; // String | The type of group to fetch, must be a valid FavoriteType.
605605
String favoriteGroupName = "favoriteGroupName_example"; // String |
606606
String userId = "userId_example"; // String |
607607
InlineObject9 inlineObject9 = new InlineObject9(); // InlineObject9 |

‎docs/InviteApi.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class Example {
5050

5151
InviteApi apiInstance = new InviteApi(defaultClient);
5252
String userId = "userId_example"; // String |
53-
String messageType = "messageType_example"; // String |
53+
String messageType = "message"; // String |
5454
Integer messageId = 56; // Integer |
5555
try {
5656
InviteMessage result = apiInstance.getInviteMessage(userId, messageType, messageId);
@@ -131,7 +131,7 @@ public class Example {
131131

132132
InviteApi apiInstance = new InviteApi(defaultClient);
133133
String userId = "userId_example"; // String |
134-
String messageType = "messageType_example"; // String |
134+
String messageType = "message"; // String |
135135
try {
136136
List<InviteMessage> result = apiInstance.getInviteMessages(userId, messageType);
137137
System.out.println(result);
@@ -364,7 +364,7 @@ public class Example {
364364

365365
InviteApi apiInstance = new InviteApi(defaultClient);
366366
String userId = "userId_example"; // String |
367-
String messageType = "messageType_example"; // String |
367+
String messageType = "message"; // String |
368368
Integer messageId = 56; // Integer |
369369
try {
370370
List<InviteMessage> result = apiInstance.resetInviteMessage(userId, messageType, messageId);
@@ -524,7 +524,7 @@ public class Example {
524524

525525
InviteApi apiInstance = new InviteApi(defaultClient);
526526
String userId = "userId_example"; // String |
527-
String messageType = "messageType_example"; // String |
527+
String messageType = "message"; // String |
528528
Integer messageId = 56; // Integer |
529529
try {
530530
List<InviteMessage> result = apiInstance.updateInviteMessage(userId, messageType, messageId);

‎docs/WorldsApi.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public class Example {
198198
String featured = "featured_example"; // String | Filters on featured results.
199199
String sort = "popularity"; // String |
200200
Integer n = 60; // Integer | The number of objects to return.
201-
String order = "descending"; // String |
201+
String order = "ascending"; // String |
202202
Integer offset = 56; // Integer | A zero-based offset from the default object sorting from where search results start.
203203
String search = "search_example"; // String | Filters by world name.
204204
String tag = "tag_example"; // String | Tags to include (comma-separated).
@@ -296,7 +296,7 @@ public class Example {
296296
String featured = "featured_example"; // String | Filters on featured results.
297297
String sort = "popularity"; // String |
298298
Integer n = 60; // Integer | The number of objects to return.
299-
String order = "descending"; // String |
299+
String order = "ascending"; // String |
300300
Integer offset = 56; // Integer | A zero-based offset from the default object sorting from where search results start.
301301
String search = "search_example"; // String | Filters by world name.
302302
String tag = "tag_example"; // String | Tags to include (comma-separated).
@@ -397,7 +397,7 @@ public class Example {
397397
String featured = "featured_example"; // String | Filters on featured results.
398398
String sort = "popularity"; // String |
399399
Integer n = 60; // Integer | The number of objects to return.
400-
String order = "descending"; // String |
400+
String order = "ascending"; // String |
401401
Integer offset = 56; // Integer | A zero-based offset from the default object sorting from where search results start.
402402
String search = "search_example"; // String | Filters by world name.
403403
String tag = "tag_example"; // String | Tags to include (comma-separated).
@@ -874,10 +874,10 @@ public class Example {
874874
WorldsApi apiInstance = new WorldsApi(defaultClient);
875875
String featured = "featured_example"; // String | Filters on featured results.
876876
String sort = "popularity"; // String |
877-
String user = "user_example"; // String | Set to `me` for searching own worlds.
877+
String user = "me"; // String | Set to `me` for searching own worlds.
878878
String userId = "userId_example"; // String | Filter by UserID.
879879
Integer n = 60; // Integer | The number of objects to return.
880-
String order = "descending"; // String |
880+
String order = "ascending"; // String |
881881
Integer offset = 56; // Integer | A zero-based offset from the default object sorting from where search results start.
882882
String search = "search_example"; // String | Filters by world name.
883883
String tag = "tag_example"; // String | Tags to include (comma-separated).

‎git_push.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
33
#
4-
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
4+
# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"
55

66
git_user_id=$1
77
git_repo_id=$2
@@ -38,14 +38,14 @@ git add .
3838
git commit -m "$release_note"
3939

4040
# Sets the new remote
41-
git_remote=`git remote`
41+
git_remote=$(git remote)
4242
if [ "$git_remote" = "" ]; then # git remote not defined
4343

4444
if [ "$GIT_TOKEN" = "" ]; then
4545
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
4646
git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
4747
else
48-
git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
48+
git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
4949
fi
5050

5151
fi
@@ -55,4 +55,3 @@ git pull origin master
5555
# Pushes (Forces) the changes in the local repository up to the remote repository
5656
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
5757
git push origin master 2>&1 | grep -v 'To https'
58-

‎gradle.properties‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
# Uncomment to build for Android
2-
#target = android
1+
# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator).
2+
# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option.
3+
#
4+
# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
5+
# For example, uncomment below to build for Android
6+
#target = android

‎gradle/wrapper/gradle-wrapper.jar‎

333 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)