Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: npm install @openapitools/openapi-generator-cli

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

- name: Download Specification
run: wget "${SPEC_URL}" '--output-document' "${ARTIFACT_NAME}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '8' ]
java: [ 17, 21 ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
Expand Down
40 changes: 36 additions & 4 deletions .openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ docs/InstancesApi.md
docs/Inventory.md
docs/InventoryApi.md
docs/InventoryConsumptionResults.md
docs/InventoryDefaultAttributes1.md
docs/InventoryDefaultAttributes1Validator.md
docs/InventoryDefaultAttributesValue.md
docs/InventoryDefaultAttributesValueValidator.md
docs/InventoryDrop.md
docs/InventoryEquipSlot.md
docs/InventoryFlag.md
Expand Down Expand Up @@ -214,13 +214,21 @@ docs/ModerationReport.md
docs/MutualFriend.md
docs/Mutuals.md
docs/Notification.md
docs/NotificationDetailBoop.md
docs/NotificationDetailInvite.md
docs/NotificationDetailInviteResponse.md
docs/NotificationDetailRequestInvite.md
docs/NotificationDetailRequestInviteResponse.md
docs/NotificationDetailVoteToKick.md
docs/NotificationType.md
docs/NotificationV2.md
docs/NotificationV2Data.md
docs/NotificationV2DataBadgeEarned.md
docs/NotificationV2DataBoop.md
docs/NotificationV2DataEventAnnouncement.md
docs/NotificationV2DataGroupAnnouncement.md
docs/NotificationV2DataGroupInformative.md
docs/NotificationV2DataGroupTransfer.md
docs/NotificationV2DetailsBoop.md
docs/NotificationV2Response.md
docs/NotificationV2Type.md
Expand All @@ -245,6 +253,8 @@ docs/PlayermoderationApi.md
docs/Print.md
docs/PrintFiles.md
docs/PrintsApi.md
docs/PrivateProfile.md
docs/PrivateProfileActivity.md
docs/Product.md
docs/ProductListing.md
docs/ProductListingType.md
Expand All @@ -256,20 +266,24 @@ docs/ProductPurchaseProduct.md
docs/ProductPurchasePurchaseContext.md
docs/ProductPurchaseRecord.md
docs/ProductType.md
docs/ProfileRepresentedGroup.md
docs/Prop.md
docs/PropPublishStatus.md
docs/PropUnityPackage.md
docs/PropsApi.md
docs/PublicProfile.md
docs/PurchaseContextData.md
docs/PurchaseProductListingRequest.md
docs/Region.md
docs/RegisterUserAccount200Response.md
docs/RegisterUserAccountRequest.md
docs/ReleaseStatus.md
docs/ReportCategory.md
docs/ReportReason.md
docs/RepresentedGroup.md
docs/RequestInviteRequest.md
docs/RequestInviteWithPhotoRequest.md
docs/RequiresTwoFactorAuth.md
docs/RespondGroupJoinRequest.md
docs/RespondInviteWithPhotoRequest.md
docs/RespondNotificationV2Request.md
Expand All @@ -282,6 +296,7 @@ docs/RewardRedemptionResult.md
docs/SearchGroupMembers200Response.md
docs/SellerEligibility.md
docs/SentNotification.md
docs/SentNotificationDetails.md
docs/ServiceQueueStats.md
docs/ServiceStatus.md
docs/ShareInventoryItemDirectRequest.md
Expand Down Expand Up @@ -310,6 +325,7 @@ docs/TransactionSteamWalletInfo.md
docs/TransferGroupRequest.md
docs/TutorialStatus.md
docs/TwoFactorAuthCode.md
docs/TwoFactorAuthType.md
docs/TwoFactorEmailCode.md
docs/TwoFactorRecoveryCodes.md
docs/TwoFactorRecoveryCodesOtpInner.md
Expand Down Expand Up @@ -559,8 +575,8 @@ src/main/java/io/github/vrchatapi/model/InstanceShortNameResponse.java
src/main/java/io/github/vrchatapi/model/InstanceType.java
src/main/java/io/github/vrchatapi/model/Inventory.java
src/main/java/io/github/vrchatapi/model/InventoryConsumptionResults.java
src/main/java/io/github/vrchatapi/model/InventoryDefaultAttributes1.java
src/main/java/io/github/vrchatapi/model/InventoryDefaultAttributes1Validator.java
src/main/java/io/github/vrchatapi/model/InventoryDefaultAttributesValue.java
src/main/java/io/github/vrchatapi/model/InventoryDefaultAttributesValueValidator.java
src/main/java/io/github/vrchatapi/model/InventoryDrop.java
src/main/java/io/github/vrchatapi/model/InventoryEquipSlot.java
src/main/java/io/github/vrchatapi/model/InventoryFlag.java
Expand Down Expand Up @@ -598,13 +614,21 @@ src/main/java/io/github/vrchatapi/model/ModerationReport.java
src/main/java/io/github/vrchatapi/model/MutualFriend.java
src/main/java/io/github/vrchatapi/model/Mutuals.java
src/main/java/io/github/vrchatapi/model/Notification.java
src/main/java/io/github/vrchatapi/model/NotificationDetailBoop.java
src/main/java/io/github/vrchatapi/model/NotificationDetailInvite.java
src/main/java/io/github/vrchatapi/model/NotificationDetailInviteResponse.java
src/main/java/io/github/vrchatapi/model/NotificationDetailRequestInvite.java
src/main/java/io/github/vrchatapi/model/NotificationDetailRequestInviteResponse.java
src/main/java/io/github/vrchatapi/model/NotificationDetailVoteToKick.java
src/main/java/io/github/vrchatapi/model/NotificationType.java
src/main/java/io/github/vrchatapi/model/NotificationV2.java
src/main/java/io/github/vrchatapi/model/NotificationV2Data.java
src/main/java/io/github/vrchatapi/model/NotificationV2DataBadgeEarned.java
src/main/java/io/github/vrchatapi/model/NotificationV2DataBoop.java
src/main/java/io/github/vrchatapi/model/NotificationV2DataEventAnnouncement.java
src/main/java/io/github/vrchatapi/model/NotificationV2DataGroupAnnouncement.java
src/main/java/io/github/vrchatapi/model/NotificationV2DataGroupInformative.java
src/main/java/io/github/vrchatapi/model/NotificationV2DataGroupTransfer.java
src/main/java/io/github/vrchatapi/model/NotificationV2DetailsBoop.java
src/main/java/io/github/vrchatapi/model/NotificationV2Response.java
src/main/java/io/github/vrchatapi/model/NotificationV2Type.java
Expand All @@ -626,6 +650,8 @@ src/main/java/io/github/vrchatapi/model/PlayerModeration.java
src/main/java/io/github/vrchatapi/model/PlayerModerationType.java
src/main/java/io/github/vrchatapi/model/Print.java
src/main/java/io/github/vrchatapi/model/PrintFiles.java
src/main/java/io/github/vrchatapi/model/PrivateProfile.java
src/main/java/io/github/vrchatapi/model/PrivateProfileActivity.java
src/main/java/io/github/vrchatapi/model/Product.java
src/main/java/io/github/vrchatapi/model/ProductListing.java
src/main/java/io/github/vrchatapi/model/ProductListingType.java
Expand All @@ -637,19 +663,23 @@ src/main/java/io/github/vrchatapi/model/ProductPurchaseProduct.java
src/main/java/io/github/vrchatapi/model/ProductPurchasePurchaseContext.java
src/main/java/io/github/vrchatapi/model/ProductPurchaseRecord.java
src/main/java/io/github/vrchatapi/model/ProductType.java
src/main/java/io/github/vrchatapi/model/ProfileRepresentedGroup.java
src/main/java/io/github/vrchatapi/model/Prop.java
src/main/java/io/github/vrchatapi/model/PropPublishStatus.java
src/main/java/io/github/vrchatapi/model/PropUnityPackage.java
src/main/java/io/github/vrchatapi/model/PublicProfile.java
src/main/java/io/github/vrchatapi/model/PurchaseContextData.java
src/main/java/io/github/vrchatapi/model/PurchaseProductListingRequest.java
src/main/java/io/github/vrchatapi/model/Region.java
src/main/java/io/github/vrchatapi/model/RegisterUserAccount200Response.java
src/main/java/io/github/vrchatapi/model/RegisterUserAccountRequest.java
src/main/java/io/github/vrchatapi/model/ReleaseStatus.java
src/main/java/io/github/vrchatapi/model/ReportCategory.java
src/main/java/io/github/vrchatapi/model/ReportReason.java
src/main/java/io/github/vrchatapi/model/RepresentedGroup.java
src/main/java/io/github/vrchatapi/model/RequestInviteRequest.java
src/main/java/io/github/vrchatapi/model/RequestInviteWithPhotoRequest.java
src/main/java/io/github/vrchatapi/model/RequiresTwoFactorAuth.java
src/main/java/io/github/vrchatapi/model/RespondGroupJoinRequest.java
src/main/java/io/github/vrchatapi/model/RespondInviteWithPhotoRequest.java
src/main/java/io/github/vrchatapi/model/RespondNotificationV2Request.java
Expand All @@ -662,6 +692,7 @@ src/main/java/io/github/vrchatapi/model/RewardRedemptionResult.java
src/main/java/io/github/vrchatapi/model/SearchGroupMembers200Response.java
src/main/java/io/github/vrchatapi/model/SellerEligibility.java
src/main/java/io/github/vrchatapi/model/SentNotification.java
src/main/java/io/github/vrchatapi/model/SentNotificationDetails.java
src/main/java/io/github/vrchatapi/model/ServiceQueueStats.java
src/main/java/io/github/vrchatapi/model/ServiceStatus.java
src/main/java/io/github/vrchatapi/model/ShareInventoryItemDirectRequest.java
Expand Down Expand Up @@ -690,6 +721,7 @@ src/main/java/io/github/vrchatapi/model/TransactionSteamWalletInfo.java
src/main/java/io/github/vrchatapi/model/TransferGroupRequest.java
src/main/java/io/github/vrchatapi/model/TutorialStatus.java
src/main/java/io/github/vrchatapi/model/TwoFactorAuthCode.java
src/main/java/io/github/vrchatapi/model/TwoFactorAuthType.java
src/main/java/io/github/vrchatapi/model/TwoFactorEmailCode.java
src/main/java/io/github/vrchatapi/model/TwoFactorRecoveryCodes.java
src/main/java/io/github/vrchatapi/model/TwoFactorRecoveryCodesOtpInner.java
Expand Down
2 changes: 1 addition & 1 deletion .openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.2.1
7.24.0
26 changes: 12 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'java'
apply plugin: 'com.diffplug.spotless'

group = 'io.github.vrchatapi'
version = '1.20.7'
version = '1.20.8-nightly.20'

buildscript {
repositories {
Expand Down Expand Up @@ -62,9 +62,9 @@ if(hasProperty('target') && target == 'android') {
def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
task.description = "Create jar artifact for ${variant.name}"
task.dependsOn variant.javaCompile
task.from variant.javaCompile.destinationDir
task.destinationDir = project.file("${project.buildDir}/outputs/jar")
task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
task.from variant.javaCompile.destinationDirectory
task.destinationDirectory = project.file("${project.buildDir}/outputs/jar")
task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar"
artifacts.add('archives', task)
}
}
Expand Down Expand Up @@ -106,20 +106,18 @@ ext {
}

dependencies {
implementation 'io.swagger:swagger-annotations:1.6.8'
implementation "com.google.code.findbugs:jsr305:3.0.2"
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
implementation 'com.squareup.okhttp3:logging-interceptor:4.12.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 'io.gsonfire:gson-fire:1.9.0'
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.6'
implementation 'org.openapitools:jackson-databind-nullable:0.2.10'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.18.0'
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.3'
testImplementation 'org.mockito:mockito-core:3.12.4'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.3'
}

javadoc {
Expand Down
23 changes: 11 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,25 @@ lazy val root = (project in file(".")).
settings(
organization := "io.github.vrchatapi",
name := "vrchatapi",
version := "1.20.7",
scalaVersion := "2.11.4",
version := "1.20.8-nightly.20",
scalaVersion := "2.11.12",
scalacOptions ++= Seq("-feature"),
javacOptions in compile ++= Seq("-Xlint:deprecation"),
publishArtifact in (Compile, packageDoc) := false,
compile / javacOptions ++= Seq("-Xlint:deprecation"),
Compile / packageDoc / publishArtifact := false,
resolvers += Resolver.mavenLocal,
libraryDependencies ++= Seq(
"io.swagger" % "swagger-annotations" % "1.6.5",
"com.squareup.okhttp3" % "okhttp" % "4.10.0",
"com.squareup.okhttp3" % "logging-interceptor" % "4.10.0",
"com.squareup.okhttp3" % "okhttp" % "4.12.0",
"com.squareup.okhttp3" % "logging-interceptor" % "4.12.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",
"org.apache.commons" % "commons-lang3" % "3.18.0",
"jakarta.ws.rs" % "jakarta.ws.rs-api" % "2.1.6",
"org.openapitools" % "jackson-databind-nullable" % "0.2.10",
"io.gsonfire" % "gson-fire" % "1.9.0" % "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",
"org.junit.jupiter" % "junit-jupiter-api" % "5.9.1" % "test",
"org.junit.jupiter" % "junit-jupiter-api" % "5.10.3" % "test",
"com.novocode" % "junit-interface" % "0.10" % "test",
"org.mockito" % "mockito-core" % "3.12.4" % "test"
)
Expand Down
Loading
Loading