Fix shadow issues

NRB-Tech · Jul 9, 2024 · da747dd · da747dd
1 parent b9ac5df
commit da747dd
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+## Version 2.2.4 - 1 July 24
+
+* Fixed issue with publishing
+
 ## Version 2.2.3 – 30 June 24
 
 * Upgraded dependencies and gradle

diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ If you use Maven to build your project — as a Maven project dependency:
 ```
 
 ### Snapshot
-If your are interested in cutting-edge build you can get a `master-SNAPSHOT` or `develop-SNAPSHOT` version of the library.
+If your are interested in cutting-edge build you can get a `main-SNAPSHOT` or `develop-SNAPSHOT` version of the library.
 NOTE: Snapshots are built from the top of the `master` and `develop` branches and a subject to more frequent changes that may break the API and/or change behavior.
 
 To be able to download it you need to add Sonatype Snapshot repository site to your `build.gradle` file:

diff --git a/build.gradle b/build.gradle
@@ -3,14 +3,18 @@ apply from: rootProject.file('gradle/gradle-mvn-config.gradle')
 apply from: 'dependencies.gradle'
 apply from: 'checkstyle.gradle'
 
+
+
 buildscript {
     ext.kotlinVersion = '1.8.21'
+    ext.shadowPluginVersion = '8.1.1'
     repositories {
         maven {
             url "https://plugins.gradle.org/m2/"
         }
         google()
         mavenCentral()
+        gradlePluginPortal()
     }
 
     dependencies {
@@ -19,12 +23,13 @@ buildscript {
         classpath 'gradle.plugin.org.codehaus.groovy:groovy-android-gradle-plugin:3.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "io.github.gradle-nexus:publish-plugin:1.1.0"
+        classpath "com.github.johnrengelman:shadow:$shadowPluginVersion"
     }
 }
 
 allprojects {
     apply plugin: 'com.github.ben-manes.versions'
-    
+
     repositories {
         google()
         maven {
@@ -74,5 +79,5 @@ allprojects {
 }
 
 tasks.register('clean', Delete) {
-    delete rootProject.buildDir
+    delete rootProject.getLayout().getBuildDirectory()
 }
diff --git a/dagger-compiler-shadow/build.gradle b/dagger-compiler-shadow/build.gradle
@@ -4,9 +4,6 @@ buildscript {
             url "https://plugins.gradle.org/m2/"
         }
     }
-    dependencies {
-        classpath "gradle.plugin.com.github.johnrengelman:shadow:$rootProject.ext.shadowPluginVersion"
-    }
 }
 
 apply plugin: 'java'

diff --git a/dagger-library-shadow/build.gradle b/dagger-library-shadow/build.gradle
@@ -4,9 +4,6 @@ buildscript {
             url "https://plugins.gradle.org/m2/"
         }
     }
-    dependencies {
-        classpath "gradle.plugin.com.github.johnrengelman:shadow:$rootProject.ext.shadowPluginVersion"
-    }
 }
 
 apply plugin: 'java'

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,7 +2,6 @@ ext {
     rxJavaVersion = '3.1.8'
     sourceCompatibilityVersion = JavaVersion.VERSION_17
     targetCompatibilityVersion = JavaVersion.VERSION_17
-    shadowPluginVersion = '7.1.2'
     daggerVersion = '2.51.1'
     libs = [
             /* Library-only dependencies */

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=io.nrbtech.rxandroidble
-VERSION_NAME=2.2.3
+VERSION_NAME=2.2.4
 
 POM_DESCRIPTION=RxJava backed support for Bluetooth Low Energy in Android
 

diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle
@@ -16,58 +16,66 @@
 
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 version = VERSION_NAME
 group = GROUP
 
 afterEvaluate { project ->
-    if (isAndroidProject(project)) {
-        android.libraryVariants.matching { it.name == "release" }.each { releaseVariant ->
-            task javadocs(type: Javadoc, dependsOn: ['assembleRelease']) {
-                source = android.sourceSets.main.java.source
-                classpath += project.files(
-                        files(releaseVariant.javaCompileProvider.get().classpath),
-                        project.android.getBootClasspath().join(File.pathSeparator),
-                        files("$buildDir/intermediates/classes/release"),
-                        files("$buildDir/generated/ap_generated_sources/release/out"),
-                        files("$project.rootProject.rootDir/dagger-library-shadow/build/libs/dagger-library-shadow-${project.version}.jar")
-                )
+    if(!project.tasks.findByName('shadowJar')) {
+        if (isAndroidProject(project)) {
+            android.libraryVariants.matching { it.name == "release" }.each { releaseVariant ->
+                tasks.register('javadocs', Javadoc) {
+                    dependsOn 'assembleRelease'
+                    source = android.sourceSets.main.java.source
+                    classpath += project.files(
+                            files(releaseVariant.javaCompileProvider.get().classpath),
+                            project.android.getBootClasspath().join(File.pathSeparator),
+                            files("$buildDir/intermediates/classes/release"),
+                            files("$buildDir/generated/ap_generated_sources/release/out"),
+                            files("$project.rootProject.rootDir/dagger-library-shadow/build/libs/dagger-library-shadow-${project.version}.jar")
+                    )
+                    title = null
+                    options.noTimestamp(false)
+                }
+            }
+        } else {
+            tasks.register('javadocs', Javadoc) {
+                source = sourceSets.main.java.classesDirectory
+                classpath += configurations.compileClasspath
                 title = null
                 options.noTimestamp(false)
             }
         }
-    } else {
-        task javadocs(type: Javadoc) {
-            source = sourceSets.main.java.classesDirectory
-            classpath += configurations.compileClasspath
-            title = null
-            options.noTimestamp(false)
+        tasks.register('javadocsJar', Jar) {
+            dependsOn javadocs
+            archiveClassifier.set('javadoc')
+            from javadocs.destinationDir
         }
-    }
-    task javadocsJar(type: Jar, dependsOn: javadocs) {
-        archiveClassifier.set('javadoc')
-        from javadocs.destinationDir
-    }
 
-    task sourcesJar(type: Jar) {
-        archiveClassifier.set('sources')
-        if (isAndroidProject(project)) {
-            from android.sourceSets.main.java.source
-        } else {
-            from sourceSets.main.allSource
+        tasks.register('sourcesJar', Jar) {
+            archiveClassifier.set('sources')
+            if (isAndroidProject(project)) {
+                from android.sourceSets.main.java.source
+            } else {
+                from sourceSets.main.allSource
+            }
         }
     }
-
     publishing {
         publications {
-            release(MavenPublication) {
+            release(MavenPublication) { publication ->
                 afterEvaluate {
-                    from isAndroidProject(project) ? components.release : components.java
                     groupId = GROUP
                     artifactId = POM_ARTIFACT_ID
                     version = VERSION_NAME
-                    artifact sourcesJar
-                    artifact javadocsJar
+                    if (project.tasks.findByName('shadowJar')) {
+                        project.shadow.component(publication)
+                    } else {
+                        from isAndroidProject(project) ? components.release : components.java
+                        artifact sourcesJar
+                        artifact javadocsJar
+                    }
                     pom {
                         name = POM_NAME
                         description = POM_DESCRIPTION

diff --git a/mockrxandroidble/build.gradle b/mockrxandroidble/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'groovyx.android'
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
+apply plugin: 'com.github.johnrengelman.shadow'
 
 android {
     namespace 'io.nrbtech.rxandroidble.mockrxandroidble'