diff --git a/grease/build.gradle.kts b/grease/build.gradle.kts index 08de9cf..6db6c25 100644 --- 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") } } -} \ No newline at end of file +} diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt index c8d3f28..e671728 100644 --- 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 { 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 new file mode 100644 index 0000000..dbd2cdc --- /dev/null +++ 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 index e467416..61dc50d 100644 --- 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 -} \ No newline at end of file +} diff --git a/tests/sample-dependency-pure/build.gradle.kts b/tests/sample-dependency-pure/build.gradle.kts index e221e25..fb59388 100644 --- 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 -} \ No newline at end of file +} diff --git a/tests/sample-library/build.gradle.kts b/tests/sample-library/build.gradle.kts index fd2770c..f56e7b0 100644 --- 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") -} \ No newline at end of file +} 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 new file mode 100644 index 0000000..c5fe393 --- /dev/null +++ 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 new file mode 100644 index 0000000..05aa897 --- /dev/null +++ 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 new file mode 100644 index 0000000..7e8c49a --- /dev/null +++ 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