feat: bump gradle & java versions

Author: triniwiz

dts-generator/build.gradle

@@ -4,14 +4,25 @@ import java.util.jar.JarFile
 
 apply plugin: 'java-library'
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
-def version = "3.0.0"
+def version = "4.0.0"
 
 def hasProject = file("$project.rootDir/gradle.properties").exists();
 
-if(!project.hasProperty("loadedProjectDeps") && hasProject){
+repositories {
+    google()
+    mavenCentral()
+    maven {
+        url 'https://maven.google.com/'
+        name 'Google'
+    }
+    maven { url "https://repo1.maven.org/maven2/" }
+    maven { url "https://repo.maven.apache.org/maven2/" }
+}
+
+if (!project.hasProperty("loadedProjectDeps")  && hasProject) {
     Properties projectDeps = new Properties()
     projectDeps.load(new FileInputStream("$project.rootDir/gradle.properties"))
     projectDeps.each { prop ->
@@ -21,12 +32,13 @@ if(!project.hasProperty("loadedProjectDeps") && hasProject){
 }
 
 if(!hasProject){
-    project.ext.set("ns_default_bcel_version", "6.5.0");
+    project.ext.set("ns_default_bcel_version", " 6.8.2");
     project.ext.set("ns_default_commons_io_version", "2.6");
     project.ext.set("ns_default_spotbugs_version", "3.1.12");
 }
 
 
+
 // todo: check if still needed
 // if(!project.hasProperty("loadedProjectDeps")){
 //     Properties projectDeps = new Properties()
@@ -38,19 +50,17 @@ if(!hasProject){
 // }
 
 project.ext.extractedDependenciesDir = "jar-files"
-if(project.hasProperty("jarsOutput")) {
+if (project.hasProperty("jarsOutput")) {
     project.ext.extractedDependenciesDir = project.ext.jarsOutput
 }
 
-repositories {
-    google()
-    mavenCentral()
-}
 
 allprojects {
     gradle.projectsEvaluated {
-        tasks.withType(JavaCompile) {
-            options.compilerArgs << "-Xlint:all" << "-Werror"
+        tasks.withType(JavaCompile).tap {
+            configureEach {
+                options.compilerArgs << "-Xlint:all" << "-Werror"
+            }
         }
     }
 }
@@ -70,31 +80,41 @@ dependencies {
     // testCompileOnly  "androidx.appcompat:appcompat:1.0.0"
     // testCompileOnly   "com.google.android.material:material:1.0.0"
 
-    def androidXLegacyVersion = "1.0.0"
-    def androidXAppCompatVersion = "1.4.1"
-    def androidXMaterialVersion = "1.5.0"
-    def androidXExifInterfaceVersion = "1.3.3"
-    def androidXViewPagerVersion = "1.0.0"
-    def androidXFragmentVersion = "1.4.1"
-    def androidXTransitionVersion = "1.4.1"
-
-    testCompileOnly "androidx.multidex:multidex:2.0.1"
-    testCompileOnly "androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
-    testCompileOnly "androidx.appcompat:appcompat:$androidXAppCompatVersion"
-    testCompileOnly "com.google.android.material:material:$androidXMaterialVersion"
-    testCompileOnly "androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
-    testCompileOnly "androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
-    testCompileOnly "androidx.fragment:fragment:$androidXFragmentVersion"
-    testCompileOnly "androidx.transition:transition:$androidXTransitionVersion"
+//    def androidXLegacyVersion = "1.0.0"
+//    def androidXAppCompatVersion = "1.6.1"
+//    def androidXMaterialVersion = "1.8.0"
+//    def androidXExifInterfaceVersion = "1.3.7"
+//    def androidXViewPagerVersion = "1.0.0"
+//    def androidXFragmentVersion = "1.4.1"
+   def androidXTransitionVersion = "1.4.1"
+//
+//    testCompileOnly "androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
+//    testCompileOnly "androidx.appcompat:appcompat:$androidXAppCompatVersion"
+//    testCompileOnly "com.google.android.material:material:$androidXMaterialVersion"
+//    testCompileOnly "androidx.exifinterface:exifinterface:$androidXExifInterfaceVersion"
+//    testCompileOnly "androidx.viewpager2:viewpager2:$androidXViewPagerVersion"
+//    testCompileOnly "androidx.fragment:fragment:$androidXFragmentVersion"
+   testCompileOnly "androidx.transition:transition:$androidXTransitionVersion"
+}
+
+configurations.create("dtsGeneratorImplementation") {
+    extendsFrom configurations.implementation
+    setCanBeResolved(true)
+}
+
+configurations.create("dtsGeneratorTestCompileOnly") {
+    extendsFrom configurations.testCompileOnly
+    setCanBeResolved(true)
 }
 
 jar {
     //pack jar dependencies into the final jar
-    configurations.implementation.setCanBeResolved(true)
-    from configurations.implementation.collect { it.isDirectory() ? it : zipTree(it) }
+    from {
+        configurations.dtsGeneratorImplementation.collect { it.isDirectory() ? it : zipTree(it) }
+    }
     from('src/main/resources') {
-      include 'generics.txt'
-   }
+        include 'generics.txt'
+    }
     //set main class for the jar
     manifest {
         attributes 'Main-Class': 'com.telerik.Main'
@@ -110,11 +130,11 @@ task extractAllJars {
     outputs.dir extractedDependenciesDir
 
     doLast {
-        def iter = configurations.testCompileOnly.resolvedConfiguration.resolvedArtifacts.iterator()
+        def iter = configurations.dtsGeneratorTestCompileOnly.resolvedConfiguration.resolvedArtifacts.iterator()
         def dependencyCounter = 0
         while (iter.hasNext()) {
             //declaring variable as specific class for getting code completion in Android Studio
-            ResolvedDependency nextDependency = iter.next()
+            def nextDependency = iter.next()
 
             def outputDir = Paths.get(extractedDependenciesDir, nextDependency.toString()).normalize().toString().replace(':', '_')
             explodeAar(nextDependency.file, outputDir)
@@ -152,3 +172,10 @@ def explodeAar(File compileDependency, String outputDir) {
         }
     }
 }
+
+def buildMetadata = tasks.findByPath(":app:buildMetadata")
+
+if (buildMetadata != null) {
+    processResources.dependsOn(buildMetadata)
+    compileJava.dependsOn(buildMetadata)
+}

dts-generator/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists