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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 {
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion clients/algoliasearch-client-java/gradlew
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion clients/algoliasearch-client-kotlin/gradlew
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions config/clients.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@
"supportedVersions": [
"8",
"11",
"21",
"17"
"17",
"21"
]
},
"javascript": {
Expand Down
Binary file modified gradle/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions scripts/buildLanguages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions templates/java/snippets/build.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dependencies {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
vendor = JvmVendorSpec.ADOPTIUM
languageVersion = JavaLanguageVersion.of({{languageVersion}})
vendor = JvmVendorSpec.AZUL
}
}

Expand Down
4 changes: 2 additions & 2 deletions templates/java/tests/build.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repositories {
java {
toolchain {
languageVersion = JavaLanguageVersion.of({{languageVersion}})
vendor = JvmVendorSpec.ADOPTIUM
vendor = JvmVendorSpec.AZUL
}
}

Expand All @@ -33,4 +33,4 @@ test() {
events "passed", "skipped", "failed"
showStandardStreams = true
}
}
}
2 changes: 1 addition & 1 deletion tests/output/java/settings.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down