diff --git a/clients/algoliasearch-client-java/algoliasearch/build.gradle b/clients/algoliasearch-client-java/algoliasearch/build.gradle index bbfdc98a60d..dee0f4f5aa7 100644 --- a/clients/algoliasearch-client-java/algoliasearch/build.gradle +++ b/clients/algoliasearch-client-java/algoliasearch/build.gradle @@ -8,11 +8,6 @@ repositories { mavenCentral() } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { implementation 'com.google.code.findbugs:jsr305:3.0.2' api 'com.squareup.okhttp3:okhttp:4.11.0' @@ -23,9 +18,10 @@ dependencies { implementation 'org.openapitools:jackson-databind-nullable:0.2.6' } -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' options.compilerArgs += ['-Xlint:deprecation', '-Xlint:unchecked', '-Xlint:cast', '-Xlint:rawtypes'] + options.release = 8 } javadoc { diff --git a/clients/algoliasearch-client-java/gradle/wrapper/gradle-wrapper.jar b/clients/algoliasearch-client-java/gradle/wrapper/gradle-wrapper.jar index 1b33c55baab..8bdaf60c75a 100644 Binary files a/clients/algoliasearch-client-java/gradle/wrapper/gradle-wrapper.jar and b/clients/algoliasearch-client-java/gradle/wrapper/gradle-wrapper.jar differ diff --git a/clients/algoliasearch-client-java/gradle/wrapper/gradle-wrapper.properties b/clients/algoliasearch-client-java/gradle/wrapper/gradle-wrapper.properties index d4081da476b..2a84e188b85 100644 --- a/clients/algoliasearch-client-java/gradle/wrapper/gradle-wrapper.properties +++ b/clients/algoliasearch-client-java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/clients/algoliasearch-client-java/gradlew b/clients/algoliasearch-client-java/gradlew index 23d15a93670..ef07e0162b1 100755 --- a/clients/algoliasearch-client-java/gradlew +++ b/clients/algoliasearch-client-java/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/clients/algoliasearch-client-kotlin/gradle/wrapper/gradle-wrapper.jar b/clients/algoliasearch-client-kotlin/gradle/wrapper/gradle-wrapper.jar index 1b33c55baab..8bdaf60c75a 100644 Binary files a/clients/algoliasearch-client-kotlin/gradle/wrapper/gradle-wrapper.jar and b/clients/algoliasearch-client-kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/clients/algoliasearch-client-kotlin/gradle/wrapper/gradle-wrapper.properties b/clients/algoliasearch-client-kotlin/gradle/wrapper/gradle-wrapper.properties index d4081da476b..2a84e188b85 100644 --- a/clients/algoliasearch-client-kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/clients/algoliasearch-client-kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/clients/algoliasearch-client-kotlin/gradlew b/clients/algoliasearch-client-kotlin/gradlew index 23d15a93670..ef07e0162b1 100755 --- a/clients/algoliasearch-client-kotlin/gradlew +++ b/clients/algoliasearch-client-kotlin/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/config/clients.config.json b/config/clients.config.json index c2f3ea13139..4d989e676a3 100644 --- a/config/clients.config.json +++ b/config/clients.config.json @@ -131,8 +131,8 @@ "supportedVersions": [ "8", "11", - "21", - "17" + "17", + "21" ] }, "javascript": { diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle/wrapper/gradle-wrapper.jar index a4b76b9530d..8bdaf60c75a 100644 Binary files a/gradle/gradle/wrapper/gradle-wrapper.jar and b/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties index d4081da476b..2a84e188b85 100644 --- a/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/scripts/buildLanguages.ts b/scripts/buildLanguages.ts index bd19a362dc7..3bfdb5603ee 100644 --- a/scripts/buildLanguages.ts +++ b/scripts/buildLanguages.ts @@ -68,10 +68,8 @@ async function buildLanguage(language: Language, gens: Generator[], buildType: B case 'java': case 'kotlin': // the playground specify search but it will still build everything - await run( - `./gradle/gradlew -p ${cwd} ${buildType === 'client' || buildType === 'playground' ? 'assemble -Pclient=Search' : 'build'}`, - { language }, - ); + const isTestClass = buildType === 'guides' || buildType === 'snippets'; + await run(`./gradle/gradlew -p ${cwd} ${isTestClass ? 'testClasses' : 'assemble'} ${language == 'kotlin' ? '-Pclient=Search' : ''}`, { language }); break; case 'php': // await runComposerInstall(); diff --git a/templates/java/snippets/build.mustache b/templates/java/snippets/build.mustache index 9c608c2f20f..0472daec393 100644 --- a/templates/java/snippets/build.mustache +++ b/templates/java/snippets/build.mustache @@ -12,8 +12,8 @@ dependencies { java { toolchain { - languageVersion = JavaLanguageVersion.of(17) - vendor = JvmVendorSpec.ADOPTIUM + languageVersion = JavaLanguageVersion.of({{languageVersion}}) + vendor = JvmVendorSpec.AZUL } } diff --git a/templates/java/tests/build.mustache b/templates/java/tests/build.mustache index d3d241d6d11..f87f7b41db8 100644 --- a/templates/java/tests/build.mustache +++ b/templates/java/tests/build.mustache @@ -9,7 +9,7 @@ repositories { java { toolchain { languageVersion = JavaLanguageVersion.of({{languageVersion}}) - vendor = JvmVendorSpec.ADOPTIUM + vendor = JvmVendorSpec.AZUL } } @@ -33,4 +33,4 @@ test() { events "passed", "skipped", "failed" showStandardStreams = true } -} \ No newline at end of file +} diff --git a/tests/output/java/settings.gradle b/tests/output/java/settings.gradle index e0ccea1d922..babe5e769a1 100644 --- a/tests/output/java/settings.gradle +++ b/tests/output/java/settings.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' } rootProject.name = 'java-tests'