Skip to content

Commit bbaf671

Browse files
danysantiagoDagger Team
authored andcommitted
Move dagger-android tests to Gradle test sources
* Fix the Java resource folder for Android projects to be in 'resources' and not 'res' as the latter is for Android Resources (styles, images, layouts, etc). * Add proguard files to dagger-android, these are added as part of the resources instead of being generated by the dagger-android-proguard-processor as this is easily supported in Gradle. RELNOTES=N/A PiperOrigin-RevId: 761489928
1 parent 9b7a8d9 commit bbaf671

File tree

17 files changed

+47
-6
lines changed

17 files changed

+47
-6
lines changed

buildSrc/src/main/kotlin/dagger/gradle/build/DaggerConventionPlugin.kt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,20 +109,32 @@ class DaggerConventionPlugin : Plugin<Project> {
109109
private fun configureAndroidSourceSets(
110110
sourceSets: NamedDomainObjectContainer<out AndroidSourceSet>
111111
) {
112-
fun setSourceSets(name: String, sourceDir: String, resourceDir: String) {
112+
fun setSourceSets(name: String, sourceDir: String, resourceDir: String, resDir: String) {
113113
sourceSets.named(name).configure {
114114
java.srcDirs(sourceDir)
115115
kotlin.srcDirs(sourceDir)
116116
resources.srcDirs(resourceDir)
117+
res.srcDirs(resourceDir)
117118
manifest.srcFile("$name/AndroidManifest.xml")
118119
}
119120
}
120-
setSourceSets(name = "main", sourceDir = "main/java", resourceDir = "main/res")
121-
setSourceSets(name = "test", sourceDir = "test/javatests", resourceDir = "test/res")
121+
setSourceSets(
122+
name = "main",
123+
sourceDir = "main/java",
124+
resourceDir = "main/resources",
125+
resDir = "main/res",
126+
)
127+
setSourceSets(
128+
name = "test",
129+
sourceDir = "test/javatests",
130+
resourceDir = "test/resources",
131+
resDir = "test/res",
132+
)
122133
setSourceSets(
123134
name = "androidTest",
124135
sourceDir = "androidTest/javatests",
125-
resourceDir = "androidTest/res",
136+
resourceDir = "androidTest/resources",
137+
resDir = "androidTest/res",
126138
)
127139
}
128140

dagger-android-support/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ dependencies {
1515
api(libs.androidx.appcompat)
1616
api(libs.androidx.fragment)
1717
compileOnly(libs.errorprone.annotations)
18+
19+
testImplementation(libs.junit)
20+
testImplementation(libs.truth)
21+
testImplementation(libs.androidx.test.ext.junit)
22+
testImplementation(libs.robolectric)
1823
}
1924

2025
daggerBuild {

dagger-android/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ dependencies {
1111
implementation(project(":dagger-lint-aar"))
1212
api(libs.androidx.annotations)
1313
compileOnly(libs.errorprone.annotations)
14+
15+
testImplementation(libs.junit)
16+
testImplementation(libs.truth)
17+
testImplementation(libs.androidx.test.ext.junit)
18+
testImplementation(libs.robolectric)
19+
}
20+
21+
android {
22+
buildTypes {
23+
defaultConfig {
24+
proguardFiles("$projectDir/main/resources/META-INF/com.android.tools/r8/dagger-android.pro")
25+
}
26+
}
1427
}
1528

1629
daggerBuild {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-dontwarn com.google.errorprone.annotations.**
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-dontwarn com.google.errorprone.annotations.**
2+
-identifiernamestring class dagger.android.internal.AndroidInjectionKeys {
3+
java.lang.String of(java.lang.String);
4+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-dontwarn com.google.errorprone.annotations.**

0 commit comments

Comments
 (0)