refactor: Include java resources to final aar

kulemeevag · kulemeevag · commit fbdf3bcc674c · 2025-03-13T11:46:55.000+07:00
Increase version. Configure kotlin in tests
diff --git a/grease/build.gradle.kts b/grease/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "io.deepmedia.tools"
-version = "0.3.4"
+version = "0.3.5"
 
 testing {
     suites {
@@ -97,4 +97,4 @@ deployer {
             token = secret("GHUB_PERSONAL_ACCESS_TOKEN")
         }
     }
-}
+}
diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt
@@ -440,7 +440,8 @@ open class GreasePlugin : Plugin<Project> {
 
             fun injectClasses(inputJar: File) {
                 log.d { "Processing inputJar=$inputJar outputDir=${jarExtractWorkdir}..." }
-                val inputFiles = target.zipTree(inputJar).matching { include("**/*.class", "**/*.kotlin_module") }
+                //keep java resources from jar
+                val inputFiles = target.zipTree(inputJar)
                 target.copy {
                     from(inputFiles)
                     into(jarExtractWorkdir)
diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false
+}
diff --git a/tests/sample-dependency-library/build.gradle.kts b/tests/sample-dependency-library/build.gradle.kts
@@ -10,11 +10,16 @@ android {
         minSdk = 21
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 
 dependencies {
     // Empty
-}
+}
diff --git a/tests/sample-dependency-pure/build.gradle.kts b/tests/sample-dependency-pure/build.gradle.kts
@@ -10,11 +10,16 @@ android {
         minSdk = 21
     }
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 
 dependencies {
     // Empty
-}
+}
diff --git a/tests/sample-library/build.gradle.kts b/tests/sample-library/build.gradle.kts
@@ -54,6 +54,15 @@ android {
             path = file("src/main/CMakeLists.txt")
         }
     }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 dependencies {
@@ -71,4 +80,4 @@ dependencies {
     grease("org.tensorflow:tensorflow-lite:2.3.0")
     // Manifest changes, layout resources
     grease("com.otaliastudios:cameraview:2.7.2")
-}
+}
diff --git a/tests/sample-library/src/main/java/io/deepmedia/tools/grease/sample/library/spi/CommandHandler.kt b/tests/sample-library/src/main/java/io/deepmedia/tools/grease/sample/library/spi/CommandHandler.kt
@@ -0,0 +1,5 @@
+package io.deepmedia.tools.grease.sample.library.spi
+
+interface CommandHandler {
+    fun handle()
+}
diff --git a/tests/sample-library/src/main/java/io/deepmedia/tools/grease/sample/library/spi/SimpleHandler.kt b/tests/sample-library/src/main/java/io/deepmedia/tools/grease/sample/library/spi/SimpleHandler.kt
@@ -0,0 +1,7 @@
+package io.deepmedia.tools.grease.sample.library.spi
+
+class SimpleHandler : CommandHandler {
+    override fun handle() {
+        println("SPI simple handler")
+    }
+}
diff --git a/tests/sample-library/src/main/resources/META-INF/services/io.deepmedia.tools.grease.sample.library.spi.CommandHandler b/tests/sample-library/src/main/resources/META-INF/services/io.deepmedia.tools.grease.sample.library.spi.CommandHandler
@@ -0,0 +1 @@
+io.deepmedia.tools.grease.sample.library.spi.SimpleHandler

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`group = "io.deepmedia.tools"`
`10`		`-version = "0.3.4"`
	`10`	`+version = "0.3.5"`
`11`	`11`
`12`	`12`	`testing {`
`13`	`13`	`suites {`
`@@ -97,4 +97,4 @@ deployer {`
`97`	`97`	`token = secret("GHUB_PERSONAL_ACCESS_TOKEN")`
`98`	`98`	`}`
`99`	`99`	`}`
`100`		`-}`
	`100`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,16 @@ android {`
`10`	`10`	`minSdk = 21`
`11`	`11`	`}`
`12`	`12`
	`13`	`+ compileOptions {`
	`14`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`15`	`+ targetCompatibility = JavaVersion.VERSION_17`
	`16`	`+ }`
	`17`	`+`
`13`	`18`	`kotlinOptions {`
`14`		`- jvmTarget = "1.8"`
	`19`	`+ jvmTarget = "17"`
`15`	`20`	`}`
`16`	`21`	`}`
`17`	`22`
`18`	`23`	`dependencies {`
`19`	`24`	`// Empty`
`20`		`-}`
	`25`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+io.deepmedia.tools.grease.sample.library.spi.SimpleHandler`