Set OpenAPI version back to 6.2.1 and fix GitLab CI

Author: Foorack

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
       - name: Install OpenAPI Generator CLI
         run: npm install @openapitools/openapi-generator-cli
       - name: Set OpenAPI Generator version
-        run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 5.3.0
+        run: ./node_modules/\@openapitools/openapi-generator-cli/main.js version-manager set 6.2.1
       - name: Generate SDK Client
         run: bash ./generate.sh
       - name: Check version number

.openapi-generator/FILES

@@ -1,3 +1,4 @@
+.github/workflows/maven.yml
 api/openapi.yaml
 build.gradle
 build.sbt
@@ -82,6 +83,7 @@ docs/LimitedUnityPackage.md
 docs/LimitedUser.md
 docs/LimitedWorld.md
 docs/MIMEType.md
+docs/ModelFile.md
 docs/ModerateUserRequest.md
 docs/Notification.md
 docs/NotificationType.md
@@ -179,6 +181,7 @@ src/main/java/io/github/vrchatapi/model/APIConfigAnnouncement.java
 src/main/java/io/github/vrchatapi/model/APIConfigDownloadURLList.java
 src/main/java/io/github/vrchatapi/model/APIConfigEvents.java
 src/main/java/io/github/vrchatapi/model/APIHealth.java
+src/main/java/io/github/vrchatapi/model/AbstractOpenApiSchema.java
 src/main/java/io/github/vrchatapi/model/AddFavoriteRequest.java
 src/main/java/io/github/vrchatapi/model/AddGroupGalleryImageRequest.java
 src/main/java/io/github/vrchatapi/model/Avatar.java
@@ -246,6 +249,7 @@ src/main/java/io/github/vrchatapi/model/LimitedUnityPackage.java
 src/main/java/io/github/vrchatapi/model/LimitedUser.java
 src/main/java/io/github/vrchatapi/model/LimitedWorld.java
 src/main/java/io/github/vrchatapi/model/MIMEType.java
+src/main/java/io/github/vrchatapi/model/ModelFile.java
 src/main/java/io/github/vrchatapi/model/ModerateUserRequest.java
 src/main/java/io/github/vrchatapi/model/Notification.java
 src/main/java/io/github/vrchatapi/model/NotificationType.java

.openapi-generator/VERSION

@@ -1 +1 @@
-5.3.0
+6.2.1

build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 apply plugin: 'java'
+apply plugin: 'com.diffplug.spotless'
 
 group = 'io.github.vrchatapi'
 version = '1.9.1'
@@ -11,7 +12,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.11.0'
     }
 }
 
@@ -63,7 +65,7 @@ if(hasProperty('target') && target == 'android') {
             task.from variant.javaCompile.destinationDir
             task.destinationDir = project.file("${project.buildDir}/outputs/jar")
             task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
+            artifacts.add('archives', task)
         }
     }
 
@@ -104,20 +106,63 @@ ext {
 }
 
 dependencies {
-    implementation 'io.swagger:swagger-annotations:1.5.24'
+    implementation 'io.swagger:swagger-annotations:1.6.8'
     implementation "com.google.code.findbugs:jsr305:3.0.2"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'io.gsonfire:gson-fire:1.8.4'
-    implementation 'org.openapitools:jackson-databind-nullable:0.2.1'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
-    implementation 'org.threeten:threetenbp:1.4.3'
+    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+    implementation 'com.google.code.gson:gson:2.9.1'
+    implementation 'io.gsonfire:gson-fire:1.8.5'
+    implementation 'javax.ws.rs:jsr311-api:1.1.1'
+    implementation 'javax.ws.rs:javax.ws.rs-api:2.1.1'
+    implementation 'org.openapitools:jackson-databind-nullable:0.2.4'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-core:3.11.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+    testImplementation 'org.mockito:mockito-core:3.12.4'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 }
 
 javadoc {
     options.tags = [ "http.response.details:a:Http Response Details" ]
 }
+
+// Use spotless plugin to automatically format code, remove unused import, etc
+// To apply changes directly to the file, run `gradlew spotlessApply`
+// Ref: https://github.com/diffplug/spotless/tree/main/plugin-gradle
+spotless {
+    // comment out below to run spotless as part of the `check` task
+    enforceCheck false
+
+    format 'misc', {
+        // define the files (e.g. '*.gradle', '*.md') to apply `misc` to
+        target '.gitignore'
+
+        // define the steps to apply to those files
+        trimTrailingWhitespace()
+        indentWithSpaces() // Takes an integer argument if you don't like 4
+        endWithNewline()
+    }
+    java {
+        // don't need to set target, it is inferred from java
+
+        // apply a specific flavor of google-java-format
+        googleJavaFormat('1.8').aosp().reflowLongStrings()
+
+        removeUnusedImports()
+        importOrder()
+    }
+}
+
+test {
+    // Enable JUnit 5 (Gradle 4.6+).
+    useJUnitPlatform()
+
+    // Always run tests, even when nothing changed.
+    dependsOn 'cleanTest'
+
+    // Show test results.
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+
+}

build.sbt

@@ -9,18 +9,20 @@ lazy val root = (project in file(".")).
     publishArtifact in (Compile, packageDoc) := false,
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.24",
-      "com.squareup.okhttp3" % "okhttp" % "4.9.1",
-      "com.squareup.okhttp3" % "logging-interceptor" % "4.9.1",
-      "com.google.code.gson" % "gson" % "2.8.6",
-      "org.apache.commons" % "commons-lang3" % "3.10",
-      "org.openapitools" % "jackson-databind-nullable" % "0.2.1",
-      "org.threeten" % "threetenbp" % "1.4.3" % "compile",
-      "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
+      "io.swagger" % "swagger-annotations" % "1.6.5",
+      "com.squareup.okhttp3" % "okhttp" % "4.10.0",
+      "com.squareup.okhttp3" % "logging-interceptor" % "4.10.0",
+      "com.google.code.gson" % "gson" % "2.9.1",
+      "org.apache.commons" % "commons-lang3" % "3.12.0",
+      "javax.ws.rs" % "jsr311-api" % "1.1.1",
+      "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1",
+      "org.openapitools" % "jackson-databind-nullable" % "0.2.4",
+      "io.gsonfire" % "gson-fire" % "1.8.5" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
       "com.google.code.findbugs" % "jsr305" % "3.0.2" % "compile",
       "jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
-      "junit" % "junit" % "4.13.1" % "test",
-      "com.novocode" % "junit-interface" % "0.10" % "test"
+      "org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
+      "com.novocode" % "junit-interface" % "0.10" % "test",
+      "org.mockito" % "mockito-core" % "3.12.4" % "test"
     )
   )