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 @@ -149,15 +149,13 @@ dependencyManagement {
// fineract client dependencies
dependency "com.squareup.retrofit2:retrofit:2.12.0"
dependency "com.squareup.retrofit2:retrofit-mock:2.12.0"
dependency "com.squareup.retrofit2:adapter-java8:2.12.0"
dependency "com.squareup.retrofit2:adapter-rxjava2:2.12.0"
dependency "com.squareup.retrofit2:adapter-rxjava3:2.12.0"
dependency "com.squareup.retrofit2:adapter-guava:2.12.0"
dependency "com.squareup.retrofit2:converter-wire:2.12.0"
dependency "com.squareup.retrofit2:converter-jackson:2.12.0"
dependency "com.squareup.retrofit2:converter-simplexml:2.12.0"
dependency "com.squareup.retrofit2:converter-jaxb:2.12.0"
dependency "com.squareup.retrofit2:converter-java8:2.12.0"
dependency "com.squareup.retrofit2:converter-scalars:2.12.0"
dependency "com.squareup.retrofit2:converter-gson:2.12.0"
dependency "com.squareup.retrofit2:converter-protobuf:2.12.0"
Expand Down
8 changes: 1 addition & 7 deletions fineract-avro-schemas/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,7 @@ jar {
compileJava {
dependsOn buildJavaSdk
source = sourceSets.main.java.srcDirs
options.compilerArgs += ['-parameters', '-proc:none', '-Xlint:-options']
}

java {
// keep this at Java 8, not 17
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
options.compilerArgs += ['-parameters', '-proc:none']
}

tasks.withType(JavaCompile).configureEach {
Expand Down
17 changes: 6 additions & 11 deletions fineract-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,12 @@ tasks.named('licenseMain') {
}

java {
// keep this at Java 8, not 17; see https://issues.apache.org/jira/browse/FINERACT-1214
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
// This SDK is published for external consumers, including Android apps, so it stays behind the
// project toolchain. Java 17 is the ceiling that buys us: Android 14 ships OpenJDK 17 core
// libraries, and the Android Gradle Plugin still requires/targets JDK 17. Java 21+ bytecode is
// not consumable by D8/R8. The previous Java 8 pin (FINERACT-1214) predates all of that.
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

tasks.withType(JavaCompile).configureEach {
Expand All @@ -273,11 +276,3 @@ configurations {
generatedCompileClasspath.extendsFrom implementation
generatedRuntimeClasspath.extendsFrom runtimeClasspath
}

// The generated SDK targets Java 8; JUnit 6 (managed by the Boot 4 BOM) requires JVM 17+,
// so keep this module's test stack on the JUnit 5 line
dependencyManagement {
imports {
mavenBom 'org.junit:junit-bom:5.14.4'
}
}
1 change: 0 additions & 1 deletion fineract-client/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ dependencies {
implementation(
'io.swagger.core.v3:swagger-annotations-jakarta',
'com.squareup.retrofit2:retrofit',
'com.squareup.retrofit2:adapter-java8',
'com.squareup.retrofit2:adapter-rxjava2', // TODO https://github.com/OpenAPITools/openapi-generator/issues/7758
'com.squareup.retrofit2:converter-scalars',
'com.squareup.retrofit2:converter-gson',
Expand Down
9 changes: 7 additions & 2 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"helpers:pinGitHubActionDigests"
],
"ignorePaths": [
"docs/**",
"fineract-client/**"
"docs/**"
Comment thread
adamsaghy marked this conversation as resolved.
],
"ignoreDeps": [
"com.gradle.develocity"
Expand All @@ -23,6 +22,12 @@
"matchPackageNames": ["org.glassfish.jaxb:jaxb-runtime"],
"allowedVersions": "<=2.3.6"
},
{
"matchPackageNames": ["jakarta.annotation:jakarta.annotation-api"],
"matchFileNames": ["fineract-client/dependencies.gradle"],
"allowedVersions": "<2.0.0",
"description": "The OpenAPI Generator emits javax.annotation.Generated, which only exists in the 1.x line; 2.x+ moved it to the jakarta.annotation namespace. Unrelated to the Java baseline -- fineract-client targets Java 17."
},
{
"matchPackageNames": ["com.sun.mail:jakarta.mail", "com.icegreen:greenmail-junit5"],
"allowedVersions": "<=2.0.1"
Expand Down
Loading