Upgrade Gradle from 8.10.2 to 8.13

includes prerequisites:
- pcom.android.tools.build update from 8.6.1 to 8.9.1
- compileSdk update from 34 to 35 (targetSdk and minSdk are unchanged)
- .gradle and .java housekeeping fixes to reduce build warnings
This commit is contained in:
Thomas Kuehne
2025-04-17 18:16:10 +00:00
committed by José Rebelo
parent aa573ad6b7
commit c7f236790a
9 changed files with 58 additions and 46 deletions
+11 -8
View File
@@ -1,8 +1,10 @@
apply plugin: 'java'
apply plugin: 'maven-publish'
apply plugin:'application'
plugins {
id 'java'
id 'maven-publish'
id 'application'
}
archivesBaseName = 'gadgetbridge-daogenerator'
base.archivesName = 'gadgetbridge-daogenerator'
dependencies {
// https://github.com/Freeyourgadget/greenDAO/tree/fyg
@@ -17,10 +19,10 @@ sourceSets {
}
}
mainClassName = "nodomain.freeyourgadget.gadgetbridge.daogen.GBDaoGenerator"
application.mainClass = "nodomain.freeyourgadget.gadgetbridge.daogen.GBDaoGenerator"
tasks.register('genSources', JavaExec) {
mainClass = mainClassName
mainClass = application.mainClass
classpath = sourceSets.main.runtimeClasspath
workingDir = '../'
}
@@ -32,12 +34,13 @@ artifacts {
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
toolchain.languageVersion = JavaLanguageVersion.of(17)
}
tasks.named("distTar") {
duplicatesStrategy = 'include'
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
tasks.named("distZip") {
duplicatesStrategy = 'include'
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}