Merge pull request #305 from wealthfront/fix-publishing

Use withSourcesJar to fix publishing errors
wealthfront · Oct 24, 2024 · a1df2cb · a1df2cb
2 parents 5129cf2 + 6f5d73a
commit a1df2cb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 20 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'com.android.tools.build:gradle:8.1.2'
+  implementation 'com.android.tools.build:gradle:8.1.4'
   implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.wealthfront
-VERSION_NAME=2.2.7-beta
+VERSION_NAME=2.2.8-SNAPSHOT
 
 POM_DESCRIPTION=The simplest navigation library for Android
 

diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle
@@ -81,28 +81,10 @@ afterEvaluate { project ->
     }
   }
 
-  if (project.getPlugins().hasPlugin('com.android.application') ||
-      project.getPlugins().hasPlugin('com.android.library')) {
-
-    task androidSourcesJar(type: Jar) {
-      archiveClassifier = 'sources'
-      from android.sourceSets.main.java.source
-    }
-  }
-
-  artifacts {
-    if (project.getPlugins().hasPlugin('com.android.application') ||
-        project.getPlugins().hasPlugin('com.android.library')) {
-      archives androidSourcesJar
-    }
-  }
-
   publishing.publications.all { publication ->
     publication.groupId = GROUP
     publication.version = VERSION_NAME
 
-    publication.artifact androidSourcesJar
-
     configurePom(publication.pom)
   }
 

diff --git a/magellan-library/build.gradle b/magellan-library/build.gradle
@@ -36,7 +36,14 @@ android {
       minifyEnabled false
     }
   }
+
   namespace 'com.wealthfront.magellan'
+
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

diff --git a/magellan-rx2/build.gradle b/magellan-rx2/build.gradle
@@ -24,7 +24,14 @@ android {
       minifyEnabled false
     }
   }
+
   namespace 'com.wealthfront.magellan.rx2'
+
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {

diff --git a/magellan-test/build.gradle b/magellan-test/build.gradle
@@ -24,7 +24,14 @@ android {
       minifyEnabled false
     }
   }
+
   namespace 'com.wealthfront.magellan.test'
+
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+    }
+  }
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {