From 2a3cc3086667f5e33b78a7df394fdb0506a8582c Mon Sep 17 00:00:00 2001 From: ankitkumar Date: Fri, 26 Jan 2024 01:42:46 +0530 Subject: [PATCH 1/4] moved to gradle folder --- app/build.gradle | 2 +- coachmark/build.gradle | 3 +-- publish-package.gradle => gradle/publish-package.gradle | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) rename publish-package.gradle => gradle/publish-package.gradle (99%) diff --git a/app/build.gradle b/app/build.gradle index 0246372..2e31741 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0') } - implementation 'io.github.pseudoankit:coachmark:1.0.0' + implementation 'io.github.pseudoankit:coachmark:1.0.2' implementation 'androidx.activity:activity-compose:1.7.2' implementation platform('androidx.compose:compose-bom:2022.10.00') implementation 'androidx.compose.ui:ui' diff --git a/coachmark/build.gradle b/coachmark/build.gradle index f998af7..fa9cf9f 100644 --- a/coachmark/build.gradle +++ b/coachmark/build.gradle @@ -3,10 +3,9 @@ plugins { id 'org.jetbrains.kotlin.android' } -apply from: '../publish-package.gradle' +apply from: '../gradle/publish-package.gradle' ext { - VERSION_NAME = "1.0.2" ARTIFACT_ID = "coachmark" } diff --git a/publish-package.gradle b/gradle/publish-package.gradle similarity index 99% rename from publish-package.gradle rename to gradle/publish-package.gradle index d0f3ae4..c23160b 100644 --- a/publish-package.gradle +++ b/gradle/publish-package.gradle @@ -105,6 +105,7 @@ afterEvaluate { ext { GROUP_ID = "io.github.pseudoankit" + VERSION_NAME = "1.0.2" POM_DESCRIPTION = "Compose library to add coachmark" POM_URL = "https://github.com/pseudoankit/coachmark" From ab1335ed9a1e2670289d7c21491c927de06d77af Mon Sep 17 00:00:00 2001 From: ankitkumar Date: Fri, 26 Jan 2024 01:48:21 +0530 Subject: [PATCH 2/4] code refactoring --- coachmark/consumer-rules.pro | 0 coachmark/proguard-rules.pro | 21 -------- gradle/publish-package.gradle | 97 +++++++++++++++++------------------ 3 files changed, 48 insertions(+), 70 deletions(-) delete mode 100644 coachmark/consumer-rules.pro delete mode 100644 coachmark/proguard-rules.pro diff --git a/coachmark/consumer-rules.pro b/coachmark/consumer-rules.pro deleted file mode 100644 index e69de29..0000000 diff --git a/coachmark/proguard-rules.pro b/coachmark/proguard-rules.pro deleted file mode 100644 index 481bb43..0000000 --- a/coachmark/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/gradle/publish-package.gradle b/gradle/publish-package.gradle index c23160b..35ac070 100644 --- a/gradle/publish-package.gradle +++ b/gradle/publish-package.gradle @@ -1,40 +1,23 @@ apply plugin: 'maven-publish' apply plugin: 'signing' -task androidJavadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - android.libraryVariants.all { variant -> - if (variant.name == 'release') { - owner.classpath += variant.javaCompileProvider.get().classpath - } - } - - exclude '**/R.html', '**/R.*.html', '**/index.html' - options.encoding 'utf-8' - options { - addStringOption 'docencoding', 'utf-8' - addStringOption 'charset', 'utf-8' - links 'https://docs.oracle.com/javase/7/docs/api/' - links 'https://d.android.com/reference' - links 'https://developer.android.com/reference/androidx/' - } -} +ext { + GROUP_ID = "io.github.pseudoankit" + VERSION_NAME = "1.0.2" -task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) { - archiveClassifier.set('javadoc') - from androidJavadoc.destinationDir + POM_DESCRIPTION = "Compose library to add coachmark" + POM_URL = "https://github.com/pseudoankit/coachmark" + POM_SCM_CONNECTION = "scm:git@github.com:pseudoankit/coachmark.git" - preserveFileTimestamps = false - reproducibleFileOrder = true + OSS_USERNAME = System.getenv("OSS_USERNAME") + OSS_PASSWORD = System.getenv("OSS_PASSWORD") + ext."signing.keyId" = System.getenv("SIGNING_KEY_ID") + ext."signing.password" = System.getenv("SIGNING_PASSWORD") + ext."signing.secretKeyRingFile" = System.getenv("SIGNING_SECRET_KEY_RING_FILE") } -task javaSourcesJar(type: Jar) { - archiveClassifier.set('sources') - from android.sourceSets.main.java.srcDirs - - preserveFileTimestamps = false - reproducibleFileOrder = true +signing { + sign publishing.publications } afterEvaluate { @@ -45,15 +28,17 @@ afterEvaluate { from components.release groupId GROUP_ID + artifactId ARTIFACT_ID version VERSION_NAME + pom { - name = artifactId + name = ARTIFACT_ID description = POM_DESCRIPTION url = POM_URL licenses { license { - name = LICENCE_NAME - url = LICENCE_URL + name = "The Apache Software License, Version 2.0" + url = "https://www.apache.org/licenses/LICENSE-2.0.txt" } } scm { @@ -103,24 +88,38 @@ afterEvaluate { } } -ext { - GROUP_ID = "io.github.pseudoankit" - VERSION_NAME = "1.0.2" +task androidJavadoc(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + android.libraryVariants.all { variant -> + if (variant.name == 'release') { + owner.classpath += variant.javaCompileProvider.get().classpath + } + } - POM_DESCRIPTION = "Compose library to add coachmark" - POM_URL = "https://github.com/pseudoankit/coachmark" - POM_SCM_CONNECTION = "scm:git@github.com:pseudoankit/coachmark.git" + exclude '**/R.html', '**/R.*.html', '**/index.html' + options.encoding 'utf-8' + options { + addStringOption 'docencoding', 'utf-8' + addStringOption 'charset', 'utf-8' + links 'https://docs.oracle.com/javase/7/docs/api/' + links 'https://d.android.com/reference' + links 'https://developer.android.com/reference/androidx/' + } +} - OSS_USERNAME = System.getenv("OSS_USERNAME") - OSS_PASSWORD = System.getenv("OSS_PASSWORD") - ext."signing.keyId" = System.getenv("SIGNING_KEY_ID") - ext."signing.password" = System.getenv("SIGNING_PASSWORD") - ext."signing.secretKeyRingFile" = System.getenv("SIGNING_SECRET_KEY_RING_FILE") +task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) { + archiveClassifier.set('javadoc') + from androidJavadoc.destinationDir - LICENCE_NAME = "The Apache Software License, Version 2.0" - LICENCE_URL = "https://www.apache.org/licenses/LICENSE-2.0.txt" + preserveFileTimestamps = false + reproducibleFileOrder = true } -signing { - sign publishing.publications -} \ No newline at end of file +task javaSourcesJar(type: Jar) { + archiveClassifier.set('sources') + from android.sourceSets.main.java.srcDirs + + preserveFileTimestamps = false + reproducibleFileOrder = true +} From 74e78fa66b0a4c71e78b4c2807c850d1dc05cbdc Mon Sep 17 00:00:00 2001 From: ankitkumar Date: Fri, 26 Jan 2024 02:32:15 +0530 Subject: [PATCH 3/4] used keys instead of file --- gradle/publish-package.gradle | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gradle/publish-package.gradle b/gradle/publish-package.gradle index 35ac070..6564e0f 100644 --- a/gradle/publish-package.gradle +++ b/gradle/publish-package.gradle @@ -11,12 +11,15 @@ ext { OSS_USERNAME = System.getenv("OSS_USERNAME") OSS_PASSWORD = System.getenv("OSS_PASSWORD") - ext."signing.keyId" = System.getenv("SIGNING_KEY_ID") - ext."signing.password" = System.getenv("SIGNING_PASSWORD") - ext."signing.secretKeyRingFile" = System.getenv("SIGNING_SECRET_KEY_RING_FILE") + } signing { + useInMemoryPgpKeys( + System.getenv("SIGNING_KEY_ID"), + System.getenv("SIGNING_KEY"), + System.getenv("SIGNING_PASSWORD"), + ) sign publishing.publications } From 2fe0e0c99108d4a94e0a1deb196e01ba24694f4d Mon Sep 17 00:00:00 2001 From: ankitkumar Date: Fri, 26 Jan 2024 02:48:44 +0530 Subject: [PATCH 4/4] bump version --- gradle/publish-package.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/publish-package.gradle b/gradle/publish-package.gradle index 6564e0f..4098845 100644 --- a/gradle/publish-package.gradle +++ b/gradle/publish-package.gradle @@ -3,7 +3,7 @@ apply plugin: 'signing' ext { GROUP_ID = "io.github.pseudoankit" - VERSION_NAME = "1.0.2" + VERSION_NAME = "1.0.3" POM_DESCRIPTION = "Compose library to add coachmark" POM_URL = "https://github.com/pseudoankit/coachmark"