Fixed build for apps using Dagger (regression) (#794)

dariuszseweryn · Jun 14, 2022 · d72038c · d72038c
1 parent 7da7ca9
commit d72038c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/dagger-library-shadow/build.gradle b/dagger-library-shadow/build.gradle
@@ -21,6 +21,13 @@ artifacts {
     archives shadowJar
 }
 
+shadowJar {
+    // Dagger 2.25.4 introduced a file for tracking purposes. This can break apps using Dagger.
+    // See https://github.com/dariuszseweryn/RxAndroidBle/issues/789
+    // Source https://github.com/google/dagger/commit/709098caaf4c7124f5e5313c1aa9ab34fced0031
+    exclude('META-INF/com.google.dagger_dagger.version')
+}
+
 dependencies {
     implementation rootProject.ext.libs.dagger
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.polidea.rxandroidble2
-VERSION_NAME=1.15.0
+VERSION_NAME=1.15.1-SNAPSHOT
 
 POM_DESCRIPTION=RxJava backed support for Bluetooth Low Energy in Android
 

diff --git a/rxandroidble/build.gradle b/rxandroidble/build.gradle
@@ -42,13 +42,6 @@ android {
     }
 
     preBuild.dependsOn 'checkstyle'
-
-    packagingOptions {
-        // Dagger 2.25.4 introduced a file for tracking purposes. This can break apps using Dagger.
-        // See https://github.com/dariuszseweryn/RxAndroidBle/issues/789
-        // Source https://github.com/google/dagger/commit/709098caaf4c7124f5e5313c1aa9ab34fced0031
-        excludes = ['**/com.google.dagger_dagger.version']
-    }
 }
 
 androidGroovy {

diff --git a/rxandroidble3/build.gradle b/rxandroidble3/build.gradle
@@ -41,14 +41,7 @@ android {
         abortOnError false
     }
 
-//    preBuild.dependsOn 'checkstyle'
-
-    packagingOptions {
-        // Dagger 2.25.4 introduced a file for tracking purposes. This can break apps using Dagger.
-        // See https://github.com/dariuszseweryn/RxAndroidBle/issues/789
-        // Source https://github.com/google/dagger/commit/709098caaf4c7124f5e5313c1aa9ab34fced0031
-        excludes = ['**/com.google.dagger_dagger.version']
-    }
+    preBuild.dependsOn 'checkstyle'
 }
 
 apply from: rootProject.file('gradle/src-gen-rxjava3-from-rxjava2.gradle')