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
4 changes: 2 additions & 2 deletions grease/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

group = "io.deepmedia.tools"
version = "0.3.4"
version = "0.3.5"

testing {
suites {
Expand Down Expand Up @@ -97,4 +97,4 @@ deployer {
token = secret("GHUB_PERSONAL_ACCESS_TOKEN")
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions tests/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
plugins {
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
}
9 changes: 7 additions & 2 deletions tests/sample-dependency-library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ android {
minSdk = 21
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}

dependencies {
// Empty
}
}
9 changes: 7 additions & 2 deletions tests/sample-dependency-pure/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,16 @@ android {
minSdk = 21
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}

dependencies {
// Empty
}
}
11 changes: 10 additions & 1 deletion tests/sample-library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,15 @@ android {
path = file("src/main/CMakeLists.txt")
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
}
}

dependencies {
Expand All @@ -71,4 +80,4 @@ dependencies {
grease("org.tensorflow:tensorflow-lite:2.3.0")
// Manifest changes, layout resources
grease("com.otaliastudios:cameraview:2.7.2")
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package io.deepmedia.tools.grease.sample.library.spi

interface CommandHandler {
fun handle()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.deepmedia.tools.grease.sample.library.spi

class SimpleHandler : CommandHandler {
override fun handle() {
println("SPI simple handler")
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.deepmedia.tools.grease.sample.library.spi.SimpleHandler
Loading