Skip to content

Commit 8809bf9

Browse files
0xera0xera
committed
include resources from current module
1 parent c4dae7c commit 8809bf9

6 files changed

Lines changed: 42 additions & 4 deletions

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ open class GreasePlugin : Plugin<Project> {
320320

321321
val resourcesMergingWorkdir = target.greaseBuildDir.get().dir(variant.name).dir("resources")
322322
val mergedResourcesDir = resourcesMergingWorkdir.dir("merged")
323+
val currentResourcesDir = resourcesMergingWorkdir.dir("current")
323324
val blameDir = resourcesMergingWorkdir.dir("blame")
324325
val extraAndroidRes = configurations.artifactsOf(AndroidArtifacts.ArtifactType.ANDROID_RES)
325326
dependsOn(extraAndroidRes)
@@ -328,6 +329,11 @@ open class GreasePlugin : Plugin<Project> {
328329

329330
fun injectResources() {
330331
target.delete(resourcesMergingWorkdir)
332+
target.delete(currentResourcesDir)
333+
target.copy {
334+
from(outputDir.asFileTree)
335+
into(currentResourcesDir)
336+
}
331337

332338
val executorFacade = Workers.withGradleWorkers(
333339
creationConfig.services.projectInfo.path,
@@ -340,7 +346,7 @@ open class GreasePlugin : Plugin<Project> {
340346
resCompilerService = CopyToOutputDirectoryResourceCompilationService,
341347
incrementalMergedResources = mergedResourcesDir.asFile,
342348
mergedResources = outputDir.asFile.get(),
343-
resourceSets = extraAndroidRes.files.toList(),
349+
resourceSets = currentResourcesDir.asFileTree.files.toList() + extraAndroidRes.files,
344350
minSdk = minSdk.get(),
345351
aaptWorkerFacade = executorFacade,
346352
blameLogOutputFolder = blameDir.asFile,

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
plugins {
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
4+
}
5+
6+
android {
7+
namespace = "io.deepmedia.tools.grease.sample.dependency.library"
8+
compileSdk = 34
9+
defaultConfig {
10+
minSdk = 21
11+
}
12+
13+
kotlinOptions {
14+
jvmTarget = "1.8"
15+
}
16+
}
17+
18+
dependencies {
19+
// Empty
20+
}

‎tests/sample-dependency-library/src/main/res/values/strings.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="library_dependency_res">library_dependency</string>
4+
<string name="library_res">library2</string>
5+
</resources>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
34
id("io.deepmedia.tools.grease")
45
}
56

@@ -58,6 +59,9 @@ android {
5859
dependencies {
5960
grease("androidx.core:core:1.0.0")
6061

62+
grease(project(":sample-dependency-pure"))
63+
grease(project(":sample-dependency-library"))
64+
6165
// include deps to pom when publishing
6266
api("com.google.android.material:material:1.0.0")
6367
// Includes resource and some manifest changes
@@ -67,6 +71,4 @@ dependencies {
6771
grease("org.tensorflow:tensorflow-lite:2.3.0")
6872
// Manifest changes, layout resources
6973
grease("com.otaliastudios:cameraview:2.7.2")
70-
71-
grease(project(":sample-dependency-pure"))
7274
}

‎tests/sample-library/src/main/res/values/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="library_res">library</string>
4+
</resources>

‎tests/settings.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ dependencyResolutionManagement {
2424
rootProject.name = "Grease"
2525

2626
include(":sample-library")
27-
include(":sample-dependency-pure")
27+
include(":sample-dependency-pure")
28+
include(":sample-dependency-library")

0 commit comments

Comments
 (0)