From 7b072e107e6b5efa195b726d1b79053fe4af3174 Mon Sep 17 00:00:00 2001 From: Francisco Salinas Del Riego <133713499+fdelriego@users.noreply.github.com> Date: Thu, 22 Aug 2024 05:05:59 -0700 Subject: [PATCH 01/11] Fix jetifier being required (#122) This prevents the library from being flagged in Jetifier check build analyzer task. No other changes are needed :) (that I know of) --- androidplot-core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle index 389a5cfd..7602311b 100644 --- a/androidplot-core/build.gradle +++ b/androidplot-core/build.gradle @@ -89,7 +89,7 @@ def gitUrl = 'https://github.com/halfhp/androidplot.git' dependencies { implementation 'com.halfhp.fig:figlib:1.0.11' - implementation 'com.android.support:support-annotations:28.0.0' + implementation 'androidx.annotation:annotation:1.4.0' testImplementation "org.mockito:mockito-core:4.0.0" testImplementation group: 'junit', name: 'junit', version: '4.13.2' From d47fb53dccd6eff451d98dcb1e37da45e09e555f Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 08:00:37 -0500 Subject: [PATCH 02/11] uprev to 1.5.11 --- build.gradle | 2 +- docs/quickstart.md | 2 +- docs/release_notes.md | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6360970f..fdbd3e60 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ ext { theCompileSdkVersion = 32 theTargetSdkVersion = 32 theMinSdkVersion = 5 - theVersionName = '1.5.10' + theVersionName = '1.5.11' theVersionCode = 226 gitUrl = 'https://github.com/halfhp/androidplot.git' } diff --git a/docs/quickstart.md b/docs/quickstart.md index 6c0878a2..3bd87c3d 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -14,7 +14,7 @@ To use the library in your gradle project add the following to your build.gradle ```groovy dependencies { - implementation "com.androidplot:androidplot-core:1.5.10" + implementation "com.androidplot:androidplot-core:1.5.11" } ``` diff --git a/docs/release_notes.md b/docs/release_notes.md index e0c6cb82..50d52c11 100644 --- a/docs/release_notes.md +++ b/docs/release_notes.md @@ -2,6 +2,10 @@ For details on what to expect in general when updating to a new version of Androiplot, check out the [versioning doc](versioning.md). +# 1.5.11 +* Update project to latest gradle / build tools +* Fix issue with jetifier flagging an outdated dependency + # 1.5.10 * Update project to use latest gradle / build tools * (#114) fix `setLinesPerRangeLabel` & `setLinesPerDomainLabel` From e2c1bbef640349fb76def7f0f00cf36adab502b4 Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 08:15:48 -0500 Subject: [PATCH 03/11] update project files for latest android changes --- androidplot-core/build.gradle | 1 + androidplot-core/src/main/AndroidManifest.xml | 2 +- build.gradle | 2 +- demoapp/build.gradle | 1 + demoapp/src/main/AndroidManifest.xml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle index 7602311b..acfa2c11 100644 --- a/androidplot-core/build.gradle +++ b/androidplot-core/build.gradle @@ -77,6 +77,7 @@ android { lint { abortOnError false } + namespace 'com.androidplot' } diff --git a/androidplot-core/src/main/AndroidManifest.xml b/androidplot-core/src/main/AndroidManifest.xml index e83183d1..3043c930 100644 --- a/androidplot-core/src/main/AndroidManifest.xml +++ b/androidplot-core/src/main/AndroidManifest.xml @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index fdbd3e60..0e4c8e8c 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5' } } diff --git a/demoapp/build.gradle b/demoapp/build.gradle index 8c8c8d2c..b5856456 100644 --- a/demoapp/build.gradle +++ b/demoapp/build.gradle @@ -78,6 +78,7 @@ android { lint { abortOnError false } + namespace 'com.androidplot.demos' } diff --git a/demoapp/src/main/AndroidManifest.xml b/demoapp/src/main/AndroidManifest.xml index eaf69362..5b73a2b7 100644 --- a/demoapp/src/main/AndroidManifest.xml +++ b/demoapp/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4bde2d74..43c64dc4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip From 7ef1d0cbcb97879cd733aa16ed82910390cf7fed Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 10:05:07 -0500 Subject: [PATCH 04/11] updates gradle, android plugin, dependencies etc. to latest. also updates to use JDK 17. --- androidplot-core/build.gradle | 36 ++++++++++++++---------- build.gradle | 8 +++--- demoapp-wearable/build.gradle | 5 ++-- demoapp/build.gradle | 18 +++++++++--- demoapp/project.properties | 2 -- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 43 insertions(+), 28 deletions(-) diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle index acfa2c11..36b0ea63 100644 --- a/androidplot-core/build.gradle +++ b/androidplot-core/build.gradle @@ -16,7 +16,7 @@ plugins { id 'com.android.library' - id 'com.dicedmelon.gradle.jacoco-android' + id 'com.mxalbert.gradle.jacoco-android' id 'maven-publish' id 'signing' } @@ -58,9 +58,15 @@ task generateAttrsMarkdown(type: AttrMarkdown) { } android { - compileSdkVersion theCompileSdkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + defaultConfig { + compileSdk theCompileSdkVersion minSdkVersion theMinSdkVersion targetSdkVersion theTargetSdkVersion testApplicationId "com.androidplot.test" @@ -90,9 +96,9 @@ def gitUrl = 'https://github.com/halfhp/androidplot.git' dependencies { implementation 'com.halfhp.fig:figlib:1.0.11' - implementation 'androidx.annotation:annotation:1.4.0' + implementation 'androidx.annotation:annotation:1.8.2' - testImplementation "org.mockito:mockito-core:4.0.0" + testImplementation "org.mockito:mockito-core:5.7.0" testImplementation group: 'junit', name: 'junit', version: '4.13.2' testImplementation "org.robolectric:robolectric:4.7.3" } @@ -110,12 +116,12 @@ task javadoc(type: Javadoc) { } task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' + archiveClassifier.set('javadoc') from javadoc.destinationDir } task sourcesJar(type: Jar) { - classifier = 'sources' + archiveClassifier.set('sources') from android.sourceSets.main.java.srcDirs } @@ -137,9 +143,11 @@ afterEvaluate { } publications { - release(MavenPublication) { - from components.release + publications.withType(MavenPublication) { +// release(MavenPublication) { +// +// from components.release // You can then customize attributes of the publication as shown below. groupId = 'com.androidplot' @@ -176,13 +184,11 @@ afterEvaluate { } } -afterEvaluate { - signing { - def signingKey = System.getenv("SIGNING_KEY") - def signingPassword = System.getenv("SIGNING_PASSWORD") - useInMemoryPgpKeys(signingKey, signingPassword) - sign publishing.publications.release - } +signing { + def signingKey = System.getenv("SIGNING_KEY") + def signingPassword = System.getenv("SIGNING_PASSWORD") + useInMemoryPgpKeys(signingKey, signingPassword) + sign publishing.publications } artifacts { diff --git a/build.gradle b/build.gradle index 0e4c8e8c..d1140299 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,8 @@ */ ext { - theCompileSdkVersion = 32 - theTargetSdkVersion = 32 + theCompileSdkVersion = 34 + theTargetSdkVersion = 34 theMinSdkVersion = 5 theVersionName = '1.5.11' theVersionCode = 226 @@ -32,8 +32,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' - classpath 'com.dicedmelon.gradle:jacoco-android:0.1.5' + classpath 'com.android.tools.build:gradle:8.5.2' + classpath 'com.mxalbert.gradle:jacoco-android:0.2.0' } } diff --git a/demoapp-wearable/build.gradle b/demoapp-wearable/build.gradle index 3bfc0ee0..666b353e 100644 --- a/demoapp-wearable/build.gradle +++ b/demoapp-wearable/build.gradle @@ -38,9 +38,10 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 - targetCompatibility JavaVersion.VERSION_1_6 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } + buildTypes { release { minifyEnabled false diff --git a/demoapp/build.gradle b/demoapp/build.gradle index b5856456..2c2fbd52 100644 --- a/demoapp/build.gradle +++ b/demoapp/build.gradle @@ -15,7 +15,7 @@ */ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '2.0.0' repositories { mavenCentral() } @@ -33,15 +33,25 @@ plugins { apply plugin: 'kotlin-android' dependencies { - implementation "androidx.core:core-ktx:1.8.0" + implementation "androidx.core:core-ktx:1.13.1" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation project(':androidplot-core') - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.2' debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' } +kotlin { + jvmToolchain(17) +} + android { + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + compileSdkVersion theCompileSdkVersion buildFeatures { @@ -51,7 +61,7 @@ android { defaultConfig { versionCode theVersionCode versionName theVersionName - minSdkVersion 14 + minSdkVersion 19 targetSdkVersion theTargetSdkVersion applicationId "com.androidplot.demos" } diff --git a/demoapp/project.properties b/demoapp/project.properties index 29656f2d..90a2cb18 100644 --- a/demoapp/project.properties +++ b/demoapp/project.properties @@ -39,5 +39,3 @@ #proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt # using config with optimization enabled so that things like log statement removal will work: proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt -# Project target. -target=android-16 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 43c64dc4..e9defc20 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip From 01e338e4540918831b7f8d773efec37113b3ba40 Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 10:07:05 -0500 Subject: [PATCH 05/11] pull in jdk 17 in build scrip --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99a0053d..afbda48e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,12 @@ jobs: - name: Checkout Code uses: actions/checkout@v3 + - name: Set Up JDK 17 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '17' + - name: Build and Test run: ./gradlew testDebugUnitTest jacocoTestDebugUnitTestReport From 04e819db59a94ba1c386341973f6c1ff1311c29b Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 10:16:27 -0500 Subject: [PATCH 06/11] Fix broken tests --- .../src/test/java/com/androidplot/PlotTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/androidplot-core/src/test/java/com/androidplot/PlotTest.java b/androidplot-core/src/test/java/com/androidplot/PlotTest.java index 5a750afd..9e4753bf 100644 --- a/androidplot-core/src/test/java/com/androidplot/PlotTest.java +++ b/androidplot-core/src/test/java/com/androidplot/PlotTest.java @@ -34,6 +34,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -44,7 +45,8 @@ public class PlotTest extends AndroidplotTest { @Test public void testInit_withoutAttrs() { - Plot plot = mock(Plot.class); + //Plot plot = mock(Plot.class); + Plot plot = spy(new MockPlot("MockPlot")); plot.init(RuntimeEnvironment.application, null, 0); verify(plot, times(1)).onPreInit(); @@ -53,10 +55,12 @@ public void testInit_withoutAttrs() { @Test public void testInit_withAttrs() { - Plot plot = new MockPlot("MockPlot"); + Plot plot = spy(new MockPlot("MockPlot")); AttributeSet attrs = mock(AttributeSet.class); plot.init(RuntimeEnvironment.application, attrs, 0); - // TODO: verifications + + verify(plot, times(1)).onPreInit(); + verify(plot, times(1)).onAfterConfig(); } @Test From b8b3837de953fcac8f15767cf5ef9002fbac9ce1 Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 10:34:18 -0500 Subject: [PATCH 07/11] temporarily disable javadoc artifacts --- .github/workflows/build.yml | 5 ++-- androidplot-core/build.gradle | 43 +++++++++++++++++++---------------- docs/index.md | 4 +++- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afbda48e..d38f337e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,9 @@ jobs: echo $ENCODED | base64 -di > "${GITHUB_WORKSPACE}/demoapp/keystore.jks" ./gradlew assembleRelease - - name: Javadoc - run: ./gradlew javadoc +# TODO: get javadoc working again at some point +# - name: Javadoc +# run: ./gradlew javadoc - name: Code Coverage run: bash <(curl -s https://codecov.io/bash) diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle index 36b0ea63..af0adb66 100644 --- a/androidplot-core/build.gradle +++ b/androidplot-core/build.gradle @@ -103,31 +103,33 @@ dependencies { testImplementation "org.robolectric:robolectric:4.7.3" } -task javadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - failOnError false - options { - links "http://docs.oracle.com/javase/7/docs/api/" - linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference" - } - exclude '**/BuildConfig.java' - exclude '**/R.java' -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - archiveClassifier.set('javadoc') - from javadoc.destinationDir -} +// TODO: get javadoc working again at some point +//task javadoc(type: Javadoc) { +// source = android.sourceSets.main.java.srcDirs +// classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +// failOnError false +// options { +// links "http://docs.oracle.com/javase/7/docs/api/" +// linksOffline "http://d.android.com/reference","${android.sdkDirectory}/docs/reference" +// } +// exclude '**/BuildConfig.java' +// exclude '**/R.java' +//} +// +//task javadocJar(type: Jar, dependsOn: javadoc) { +// archiveClassifier.set('javadoc') +// from javadoc.destinationDir +//} task sourcesJar(type: Jar) { archiveClassifier.set('sources') from android.sourceSets.main.java.srcDirs } -javadoc { - options.overview = "src/main/java/overview.html" -} +// TODO: get javadoc working again at some point +//javadoc { +// options.overview = "src/main/java/overview.html" +//} afterEvaluate { publishing { @@ -192,6 +194,7 @@ signing { } artifacts { - archives javadocJar + // TODO: get javadoc working again at some point +// archives javadocJar archives sourcesJar } diff --git a/docs/index.md b/docs/index.md index 4959db92..90a8a021 100644 --- a/docs/index.md +++ b/docs/index.md @@ -42,7 +42,9 @@ Source code examples of the various plot types. # XML Attributes A complete list of XML attributes is [available here](attrs.md). # Javadoc -The latest Javadocs are [available here](https://javadoc.io/doc/com.androidplot/androidplot-core). +Javadocs for versions through 1.5.7 are [available here](https://javadoc.io/doc/com.androidplot/androidplot-core). Due to a build issue +producing Javadocs for the latest releases has been paused. There have been very +few changes to the API since 1.5.7 so the Javadocs should still be useful in the mean time. # Release Notes Full release notes are [available here](release_notes.md) From de72e9c24704f8d325c01aa5d45a5fccf9a4ee5b Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 11:17:51 -0500 Subject: [PATCH 08/11] uprev version code for demo app publishing --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d1140299..4b5e18de 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ ext { theTargetSdkVersion = 34 theMinSdkVersion = 5 theVersionName = '1.5.11' - theVersionCode = 226 + theVersionCode = 227 gitUrl = 'https://github.com/halfhp/androidplot.git' } From 1e11eb2683ee3b746664564f2fd64ba7c4d22576 Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 11:33:10 -0500 Subject: [PATCH 09/11] fix mavencentral publishing --- androidplot-core/build.gradle | 110 ++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 52 deletions(-) diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle index af0adb66..4d7cf020 100644 --- a/androidplot-core/build.gradle +++ b/androidplot-core/build.gradle @@ -31,13 +31,14 @@ class AttrMarkdown extends DefaultTask { def input = project.file(inFile) def output = project.file(outFile) - if(output.exists()) { + if (output.exists()) { output.delete() } output.parentFile.mkdirs() - input.text.findAll(//) { match, g1 -> g1 - if(!g1.startsWith("NODOC")) { + input.text.findAll(//) { match, g1 -> + g1 + if (!g1.startsWith("NODOC")) { output.append(g1) output.append "\n\n" } @@ -53,7 +54,7 @@ class AttrMarkdown extends DefaultTask { * The generated doc will appear in / replace androidplot/docs/attrs.md */ task generateAttrsMarkdown(type: AttrMarkdown) { - inFile = { "src/main/res/values/attrs.xml"} + inFile = { "src/main/res/values/attrs.xml" } outFile = { "../docs/attrs.md" } } @@ -85,6 +86,13 @@ android { } namespace 'com.androidplot' + publishing { + singleVariant("release") { + //withSourcesJar() + //withJavadocJar() + } + } + } group = 'com.androidplot' @@ -121,65 +129,63 @@ dependencies { // from javadoc.destinationDir //} -task sourcesJar(type: Jar) { - archiveClassifier.set('sources') - from android.sourceSets.main.java.srcDirs -} +//task sourcesJar(type: Jar) { +// archiveClassifier.set('sources') +// from android.sourceSets.main.java.srcDirs +//} // TODO: get javadoc working again at some point //javadoc { // options.overview = "src/main/java/overview.html" //} -afterEvaluate { - publishing { - repositories { - maven { - name = "Maven Central" - url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" - credentials { - username = System.getenv("OSSRH_ACTOR") - password = System.getenv("OSSRH_TOKEN") - } +publishing { + repositories { + maven { + name = "MavenCentral" + url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + credentials { + username = System.getenv("OSSRH_ACTOR") + password = System.getenv("OSSRH_TOKEN") } } + } - publications { + publications { - publications.withType(MavenPublication) { + publications.withType(MavenPublication) { // release(MavenPublication) { // // from components.release - // You can then customize attributes of the publication as shown below. - groupId = 'com.androidplot' - artifactId = 'androidplot-core' - version = theVersionName - - pom { - packaging 'aar' - name = 'Androidplot' - description = "Configure any object from XML." - url = gitUrl - licenses { - license { - name = 'The Apache Software License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } + // You can then customize attributes of the publication as shown below. + groupId = 'com.androidplot' + artifactId = 'androidplot-core' + version = theVersionName + + pom { + packaging 'aar' + name = 'Androidplot' + description = "Configure any object from XML." + url = gitUrl + licenses { + license { + name = 'The Apache Software License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' } - developers { - developer { - id = 'halfhp' - name = 'Nick Fellows' - email = 'halfhp@gmail.com' - } + } + developers { + developer { + id = 'halfhp' + name = 'Nick Fellows' + email = 'halfhp@gmail.com' } - scm { - connection = gitUrl - developerConnection = gitUrl - url = gitUrl + } + scm { + connection = gitUrl + developerConnection = gitUrl + url = gitUrl - } } } } @@ -190,11 +196,11 @@ signing { def signingKey = System.getenv("SIGNING_KEY") def signingPassword = System.getenv("SIGNING_PASSWORD") useInMemoryPgpKeys(signingKey, signingPassword) - sign publishing.publications + sign(publishing.publications) } -artifacts { - // TODO: get javadoc working again at some point -// archives javadocJar - archives sourcesJar -} +//artifacts { +// // TODO: get javadoc working again at some point +//// archives javadocJar +// archives sourcesJar +//} From a9f065fbbe20fabcf198a95b4777533ce365572f Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 12:25:24 -0500 Subject: [PATCH 10/11] fix mavencentral publishing --- androidplot-core/build.gradle | 83 ++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle index 4d7cf020..7063e0c9 100644 --- a/androidplot-core/build.gradle +++ b/androidplot-core/build.gradle @@ -88,11 +88,12 @@ android { publishing { singleVariant("release") { + withSourcesJar() + withJavadocJar() //withSourcesJar() //withJavadocJar() } } - } group = 'com.androidplot' @@ -139,53 +140,53 @@ dependencies { // options.overview = "src/main/java/overview.html" //} -publishing { - repositories { - maven { - name = "MavenCentral" - url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" - credentials { - username = System.getenv("OSSRH_ACTOR") - password = System.getenv("OSSRH_TOKEN") +afterEvaluate { + publishing { + repositories { + maven { + name = "MavenCentral" + url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + credentials { + username = System.getenv("OSSRH_ACTOR") + password = System.getenv("OSSRH_TOKEN") + } } } - } - publications { - - publications.withType(MavenPublication) { + publications { + release(MavenPublication) { // release(MavenPublication) { // -// from components.release - - // You can then customize attributes of the publication as shown below. - groupId = 'com.androidplot' - artifactId = 'androidplot-core' - version = theVersionName - - pom { - packaging 'aar' - name = 'Androidplot' - description = "Configure any object from XML." - url = gitUrl - licenses { - license { - name = 'The Apache Software License, Version 2.0' - url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + from components.release + + // You can then customize attributes of the publication as shown below. + groupId = 'com.androidplot' + artifactId = 'androidplot-core' + version = theVersionName + + pom { + packaging 'aar' + name = 'Androidplot' + description = "Configure any object from XML." + url = gitUrl + licenses { + license { + name = 'The Apache Software License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } } - } - developers { - developer { - id = 'halfhp' - name = 'Nick Fellows' - email = 'halfhp@gmail.com' + developers { + developer { + id = 'halfhp' + name = 'Nick Fellows' + email = 'halfhp@gmail.com' + } + } + scm { + connection = gitUrl + developerConnection = gitUrl + url = gitUrl } - } - scm { - connection = gitUrl - developerConnection = gitUrl - url = gitUrl - } } } From 2a15eed4decc4f4b9a604f302068d6de4b055e01 Mon Sep 17 00:00:00 2001 From: Nick Fellows Date: Thu, 22 Aug 2024 12:38:31 -0500 Subject: [PATCH 11/11] cleanup --- androidplot-core/build.gradle | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/androidplot-core/build.gradle b/androidplot-core/build.gradle index 7063e0c9..b37b2b4a 100644 --- a/androidplot-core/build.gradle +++ b/androidplot-core/build.gradle @@ -90,8 +90,6 @@ android { singleVariant("release") { withSourcesJar() withJavadocJar() - //withSourcesJar() - //withJavadocJar() } } } @@ -125,15 +123,7 @@ dependencies { // exclude '**/R.java' //} // -//task javadocJar(type: Jar, dependsOn: javadoc) { -// archiveClassifier.set('javadoc') -// from javadoc.destinationDir -//} -//task sourcesJar(type: Jar) { -// archiveClassifier.set('sources') -// from android.sourceSets.main.java.srcDirs -//} // TODO: get javadoc working again at some point //javadoc { @@ -155,8 +145,6 @@ afterEvaluate { publications { release(MavenPublication) { -// release(MavenPublication) { -// from components.release // You can then customize attributes of the publication as shown below. @@ -199,9 +187,3 @@ signing { useInMemoryPgpKeys(signingKey, signingPassword) sign(publishing.publications) } - -//artifacts { -// // TODO: get javadoc working again at some point -//// archives javadocJar -// archives sourcesJar -//}