GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — refactor: Include java resources to final aar · deepmedia/Grease@fbdf3bc

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • grease
    • build.gradle.kts
    • src/main/kotlin/io/deepmedia/tools/grease
      • GreasePlugin.kt
  • tests
    • build.gradle.kts
    • sample-dependency-library
      • build.gradle.kts
    • sample-dependency-pure
      • build.gradle.kts
    • sample-library
      • build.gradle.kts
      • src/main
        • java/io/deepmedia/tools/grease/sample/library/spi
          • CommandHandler.kt
          • SimpleHandler.kt
        • resources/META-INF/services
          • io.deepmedia.tools.grease.sample.library.spi.CommandHandler
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎grease/build.gradle.kts‎

Copy file name to clipboardExpand all lines: grease/build.gradle.kts
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
group = "io.deepmedia.tools"
10-
version = "0.3.4"
10+
version = "0.3.5"
1111

1212
testing {
1313
suites {
@@ -97,4 +97,4 @@ deployer {
9797
token = secret("GHUB_PERSONAL_ACCESS_TOKEN")
9898
}
9999
}
100-
}
100+
}
Collapse file

‎grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt‎

Copy file name to clipboardExpand all lines: grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,8 @@ open class GreasePlugin : Plugin<Project> {
440440

441441
fun injectClasses(inputJar: File) {
442442
log.d { "Processing inputJar=$inputJar outputDir=${jarExtractWorkdir}..." }
443-
val inputFiles = target.zipTree(inputJar).matching { include("**/*.class", "**/*.kotlin_module") }
443+
//keep java resources from jar
444+
val inputFiles = target.zipTree(inputJar)
444445
target.copy {
445446
from(inputFiles)
446447
into(jarExtractWorkdir)
Collapse file

‎tests/build.gradle.kts‎

Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
plugins {
2+
alias(libs.plugins.android.library) apply false
3+
alias(libs.plugins.kotlin.android) apply false
4+
}
Collapse file

‎tests/sample-dependency-library/build.gradle.kts‎

Copy file name to clipboardExpand all lines: tests/sample-dependency-library/build.gradle.kts
+7-2Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ android {
1010
minSdk = 21
1111
}
1212

13+
compileOptions {
14+
sourceCompatibility = JavaVersion.VERSION_17
15+
targetCompatibility = JavaVersion.VERSION_17
16+
}
17+
1318
kotlinOptions {
14-
jvmTarget = "1.8"
19+
jvmTarget = "17"
1520
}
1621
}
1722

1823
dependencies {
1924
// Empty
20-
}
25+
}
Collapse file

‎tests/sample-dependency-pure/build.gradle.kts‎

Copy file name to clipboardExpand all lines: tests/sample-dependency-pure/build.gradle.kts
+7-2Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ android {
1010
minSdk = 21
1111
}
1212

13+
compileOptions {
14+
sourceCompatibility = JavaVersion.VERSION_17
15+
targetCompatibility = JavaVersion.VERSION_17
16+
}
17+
1318
kotlinOptions {
14-
jvmTarget = "1.8"
19+
jvmTarget = "17"
1520
}
1621
}
1722

1823
dependencies {
1924
// Empty
20-
}
25+
}
Collapse file

‎tests/sample-library/build.gradle.kts‎

Copy file name to clipboardExpand all lines: tests/sample-library/build.gradle.kts
+10-1Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ android {
5454
path = file("src/main/CMakeLists.txt")
5555
}
5656
}
57+
58+
compileOptions {
59+
sourceCompatibility = JavaVersion.VERSION_17
60+
targetCompatibility = JavaVersion.VERSION_17
61+
}
62+
63+
kotlinOptions {
64+
jvmTarget = "17"
65+
}
5766
}
5867

5968
dependencies {
@@ -71,4 +80,4 @@ dependencies {
7180
grease("org.tensorflow:tensorflow-lite:2.3.0")
7281
// Manifest changes, layout resources
7382
grease("com.otaliastudios:cameraview:2.7.2")
74-
}
83+
}
Collapse file

‎tests/sample-library/src/main/java/io/deepmedia/tools/grease/sample/library/spi/CommandHandler.kt‎

Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package io.deepmedia.tools.grease.sample.library.spi
2+
3+
interface CommandHandler {
4+
fun handle()
5+
}
Collapse file

‎tests/sample-library/src/main/java/io/deepmedia/tools/grease/sample/library/spi/SimpleHandler.kt‎

Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package io.deepmedia.tools.grease.sample.library.spi
2+
3+
class SimpleHandler : CommandHandler {
4+
override fun handle() {
5+
println("SPI simple handler")
6+
}
7+
}
Collapse file

‎tests/sample-library/src/main/resources/META-INF/services/io.deepmedia.tools.grease.sample.library.spi.CommandHandler‎

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.deepmedia.tools.grease.sample.library.spi.SimpleHandler

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.