From ed6a0c9cbcf10fb47285ea0c1071a4096bd71edf Mon Sep 17 00:00:00 2001 From: cmathew Date: Thu, 24 Oct 2024 10:51:05 -0700 Subject: [PATCH 1/3] use withSourcesJar --- buildSrc/build.gradle | 2 +- gradle/gradle-mvn-push.gradle | 18 ------------------ magellan-library/build.gradle | 7 +++++++ magellan-rx2/build.gradle | 13 +++++++++++++ magellan-test/build.gradle | 13 +++++++++++++ 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 973c210d..12851859 100644 --- 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/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle index 126e2023..91d1d6d9 100644 --- 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 index a9048848..05d37338 100644 --- 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 index 0b4b09e2..f031e799 100644 --- a/magellan-rx2/build.gradle +++ b/magellan-rx2/build.gradle @@ -19,12 +19,25 @@ android { setTargetCompatibility(JavaVersion.VERSION_17) } + publishing { + singleVariant("release") { + withSourcesJar() + } + } + buildTypes { release { 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 index aae91b5f..1526b74e 100644 --- a/magellan-test/build.gradle +++ b/magellan-test/build.gradle @@ -24,7 +24,20 @@ android { minifyEnabled false } } + + publishing { + singleVariant("release") { + withSourcesJar() + } + } + namespace 'com.wealthfront.magellan.test' + + publishing { + singleVariant("release") { + withSourcesJar() + } + } } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { From 904496464ad289f2c864215a0af630e03aa89641 Mon Sep 17 00:00:00 2001 From: cmathew Date: Thu, 24 Oct 2024 10:57:04 -0700 Subject: [PATCH 2/3] use snapshot version --- gradle.properties | 2 +- magellan-rx2/build.gradle | 6 ------ magellan-test/build.gradle | 6 ------ 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index dc4ffd1b..ef191842 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.wealthfront -VERSION_NAME=2.2.7-beta +VERSION_NAME=2.2.8-beta-SNAPSHOT POM_DESCRIPTION=The simplest navigation library for Android diff --git a/magellan-rx2/build.gradle b/magellan-rx2/build.gradle index f031e799..fde20df8 100644 --- a/magellan-rx2/build.gradle +++ b/magellan-rx2/build.gradle @@ -19,12 +19,6 @@ android { setTargetCompatibility(JavaVersion.VERSION_17) } - publishing { - singleVariant("release") { - withSourcesJar() - } - } - buildTypes { release { minifyEnabled false diff --git a/magellan-test/build.gradle b/magellan-test/build.gradle index 1526b74e..9377818c 100644 --- a/magellan-test/build.gradle +++ b/magellan-test/build.gradle @@ -25,12 +25,6 @@ android { } } - publishing { - singleVariant("release") { - withSourcesJar() - } - } - namespace 'com.wealthfront.magellan.test' publishing { From 6f5d73ae5310136c93b48f84c50ac5c6f6d407b7 Mon Sep 17 00:00:00 2001 From: cmathew Date: Thu, 24 Oct 2024 10:57:31 -0700 Subject: [PATCH 3/3] snapshot --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ef191842..b29883e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUP=com.wealthfront -VERSION_NAME=2.2.8-beta-SNAPSHOT +VERSION_NAME=2.2.8-SNAPSHOT POM_DESCRIPTION=The simplest navigation library for Android