From 28c99150e25bc4a9765c3543ee087671d71cc7c3 Mon Sep 17 00:00:00 2001 From: Sabin Date: Mon, 21 Feb 2022 08:59:04 +1300 Subject: [PATCH 01/10] migration to maven central --- .github/workflows/publish.yml | 35 ++++++ build.gradle | 26 +++-- common.gradle | 10 +- gradle/wrapper/gradle-wrapper.properties | 2 +- publish-root.gradle | 38 +++++++ publishing.gradle | 134 +++++++++++++---------- 6 files changed, 170 insertions(+), 75 deletions(-) create mode 100644 .github/workflows/publish.yml create mode 100644 publish-root.gradle diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml new file mode 100644 index 0000000..ae5c614 --- /dev/null +++ b/.github/workflows/publish.yml @@ -0,0 +1,35 @@ +name: Publish + +on: + push: + branches: + - main + - 'releases/**' + +jobs: + publish: + name: Release build and publish + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + + # Generates other artifacts + - name: Source jar and dokka + run: ./gradlew androidSourcesJar javadocJar + + # Runs upload, and then closes & releases the repository + - name: Publish to MavenCentral + run: ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} diff --git a/build.gradle b/build.gradle index 7748a18..1cc8bd8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,25 @@ -ext { - name = "IncludeMe" -} - -apply from: 'common.gradle' +apply plugin: 'io.github.gradle-nexus.publish-plugin' +apply plugin: 'org.jetbrains.dokka' buildscript { apply from: 'common.gradle' repositories { + maven { url "https://plugins.gradle.org/m2/" } google() jcenter() } dependencies { classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.6.10' } } +apply from: "${rootDir}/publish-root.gradle" + + apply plugin: 'java-gradle-plugin' apply plugin: 'kotlin' apply plugin: 'maven-publish' @@ -31,19 +34,17 @@ gradlePlugin { } } -sourceCompatibility = 1.8 - repositories { google() jcenter() } dependencies { - compile gradleApi() - compile "com.android.tools.build:gradle:$agp_version" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation gradleApi() + implementation "com.android.tools.build:gradle:$agp_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - testCompile 'junit:junit:4.12' + testImplementation'junit:junit:4.12' } @@ -66,4 +67,5 @@ compileKotlin { } compileTestKotlin { kotlinOptions.jvmTarget = "1.8" -} \ No newline at end of file +} + diff --git a/common.gradle b/common.gradle index 823cb39..7735b11 100644 --- a/common.gradle +++ b/common.gradle @@ -1,8 +1,14 @@ ext.version = "1.0.3" ext.group = "nz.co.trademe.includeme" +ext.repo = "includeme" ext.scm = 'https://github.com/TradeMe/IncludeMe.git' ext.description = 'A Gradle plugin that simplifies working with composite builds' +ext.connection = 'scm:git:github.com/TradeMe/IncludeMe.git' +ext.developerConnection = 'scm:git:ssh://github.com/TradeMe/IncludeMe.git' +ext.url = 'https://github.com/TradeMe/IncludeMe' + + ext.bintray_version = '1.7.3' -ext.kotlin_version = '1.2.30' -ext.agp_version = "3.0.1" +ext.kotlin_version = '1.5.0' +ext.agp_version = "7.0.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6670c5..982462c 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-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip diff --git a/publish-root.gradle b/publish-root.gradle new file mode 100644 index 0000000..6532af8 --- /dev/null +++ b/publish-root.gradle @@ -0,0 +1,38 @@ + +// Create variables with empty default values +ext["signing.keyId"] = '' +ext["signing.password"] = '' +ext["signing.key"] = '' +ext["ossrhUsername"] = '' +ext["ossrhPassword"] = '' +ext["sonatypeStagingProfileId"] = '' + +File secretPropsFile = project.rootProject.file('local.properties') +if (secretPropsFile.exists()) { + // Read local.properties file first if it exists + Properties p = new Properties() + new FileInputStream(secretPropsFile).withCloseable { is -> p.load(is) } + p.each { name, value -> ext[name] = value } +} else { + // Use system environment variables + ext["ossrhUsername"] = System.getenv('OSSRH_USERNAME') + ext["ossrhPassword"] = System.getenv('OSSRH_PASSWORD') + ext["sonatypeStagingProfileId"] = System.getenv('SONATYPE_STAGING_PROFILE_ID') + ext["signing.keyId"] = System.getenv('SIGNING_KEY_ID') + ext["signing.password"] = System.getenv('SIGNING_PASSWORD') + ext["signing.key"] = System.getenv('SIGNING_KEY') + ext["snapshot"] = System.getenv('SNAPSHOT') +} + +// Set up Sonatype repository +nexusPublishing { + repositories { + sonatype { + stagingProfileId = sonatypeStagingProfileId + username = ossrhUsername + password = ossrhPassword + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + } + } +} \ No newline at end of file diff --git a/publishing.gradle b/publishing.gradle index 427c47b..aa679ee 100644 --- a/publishing.gradle +++ b/publishing.gradle @@ -1,77 +1,91 @@ apply plugin: 'maven-publish' -apply plugin: 'com.jfrog.bintray' +apply plugin: 'signing' +apply plugin: 'org.jetbrains.dokka' -project.group = project.ext.group -project.version = project.ext.version - -bintray { - user = project.hasProperty("BINTRAY_USERNAME") ? project.property('BINTRAY_USERNAME') : null - key = project.hasProperty("BINTRAY_API_KEY") ? project.property('BINTRAY_API_KEY') : null - pkg { - repo = project.ext.name - name = getArtifactId() - userOrg = 'trademe' - licenses = ['Apache-2.0'] - vcsUrl = project.ext.scm - version { - name = project.version - desc = project.ext.description - released = new Date() - vcsTag = project.version - } - publications = ['Bintray'] +task androidSourcesJar(type: Jar) { + archiveClassifier.set('sources') + if (project.plugins.findPlugin("com.android.library")) { + // For Android libraries + from android.sourceSets.main.java.srcDirs + from android.sourceSets.main.kotlin.srcDirs + } else { + from sourceSets.main.java.srcDirs + from sourceSets.main.kotlin.srcDirs } -} -// Create the pom configuration: -def pomConfig = { - licenses { - license { - name "MIT License" - url "http://www.opensource.org/licenses/mit-license.php" - distribution "repo" - } - } - scm { - url ext.scm - } + +} +task javadocJar(type: Jar, dependsOn: dokkaJavadoc) { + archiveClassifier.set('javadoc') + from dokkaJavadoc.outputDirectory } -task sourceJar(type: Jar, dependsOn: 'classes') { - from sourceSets.main.allSource - classifier = 'sources' +artifacts { + archives androidSourcesJar + archives javadocJar } -publishing.publications { - Bintray(MavenPublication) { - from components.java - groupId project.ext.group - artifactId getArtifactId() - version project.ext.version +afterEvaluate { + publishing { - artifact sourceJar + publications { + release(MavenPublication) { + groupId project.ext.group + artifactId project.ext.repo + version project.ext.version - pom.withXml { - def root = asNode() - root.appendNode('description', project.ext.description) - root.appendNode('name', project.ext.name) - root.appendNode('url', project.ext.scm) - root.children().last() + pomConfig - } - } -} + if (project.plugins.findPlugin("com.android.library")) { + from components.release + } else { + from components.java + } -def getArtifactId() { - return getArtifactId(project) + artifact androidSourcesJar + artifact javadocJar -} + // metadata + pom { + name = project.ext.repo + description = 'SDK' + url = project.ext.url + licenses { + license { + name = "MIT License" + url = "http://www.opensource.org/licenses/mit-license.php" + } + } + developers { + developer { + id = 'sabinmj' + name = 'Sabin' + email = 'sabin.mj@gmail.com' + } + // Add all other devs here... + } -def getArtifactId(someProject) { - if (!someProject.ext.has('artifactId')) { - //default artifactId is the project/module name - return someProject.getName() + // Version control info - if you're using GitHub, follow the + // format as seen here + scm { + connection = project.ext.connection + developerConnection = project.ext.developerConnection + url = project.ext.url + } + } + } + } } - return someProject.ext.artifactId +} +signing { + useInMemoryPgpKeys( + rootProject.ext["signing.keyId"], + rootProject.ext["signing.key"], + rootProject.ext["signing.password"], + ) + sign publishing.publications +} +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } \ No newline at end of file From d25d143311e111528cc68ff12e0caa577d1dd690 Mon Sep 17 00:00:00 2001 From: Sabin Date: Thu, 24 Feb 2022 08:39:08 +1300 Subject: [PATCH 02/10] snapshot fixes --- .github/workflows/publish.yml | 18 +++++++++------ .github/workflows/snapshot.yml | 42 ++++++++++++++++++++++++++++++++++ build.gradle | 7 ++++++ publish-root.gradle | 7 ++++++ publishing.gradle | 12 +++++++--- 5 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/snapshot.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ae5c614..1538055 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,6 +19,9 @@ jobs: distribution: adopt java-version: 11 + - name: Release build + run: ./gradlew build + # Generates other artifacts - name: Source jar and dokka run: ./gradlew androidSourcesJar javadocJar @@ -26,10 +29,11 @@ jobs: # Runs upload, and then closes & releases the repository - name: Publish to MavenCentral run: ./gradlew publishReleasePublicationToSonatypeRepository --max-workers 1 closeAndReleaseSonatypeStagingRepository - env: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} - SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} - SIGNING_KEY: ${{ secrets.SIGNING_KEY }} - SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + +env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml new file mode 100644 index 0000000..065ec0f --- /dev/null +++ b/.github/workflows/snapshot.yml @@ -0,0 +1,42 @@ +name: Publish Snapshot builds + + +on: + push: + branches: + - development + - 'snapshot/**' + + + + +jobs: + publish: + name: Snapshot build and publish + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + distribution: adopt + java-version: 11 + - name: Release build + + run: ./gradlew build + - name: Source jar and dokka + run: ./gradlew androidSourcesJar javadocJar + - name: Publish to MavenCentral + run: ./gradlew publishReleasePublicationToSonatypeRepository + + + +env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }} + SNAPSHOT: true \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1cc8bd8..b143c65 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,14 @@ buildscript { } } + + apply from: "${rootDir}/publish-root.gradle" +ext { + PUBLISH_VERSION = rootVersionName + ARTIFACT_ID = "includeme" +} apply plugin: 'java-gradle-plugin' apply plugin: 'kotlin' @@ -39,6 +45,7 @@ repositories { jcenter() } + dependencies { implementation gradleApi() implementation "com.android.tools.build:gradle:$agp_version" diff --git a/publish-root.gradle b/publish-root.gradle index 6532af8..c71c885 100644 --- a/publish-root.gradle +++ b/publish-root.gradle @@ -24,10 +24,17 @@ if (secretPropsFile.exists()) { ext["snapshot"] = System.getenv('SNAPSHOT') } +if (snapshot) { + ext["rootVersionName"] = project.ext.version + "-SNAPSHOT" +} else { + ext["rootVersionName"] = project.ext.version +} + // Set up Sonatype repository nexusPublishing { repositories { sonatype { + version = rootVersionName stagingProfileId = sonatypeStagingProfileId username = ossrhUsername password = ossrhPassword diff --git a/publishing.gradle b/publishing.gradle index aa679ee..e8e123b 100644 --- a/publishing.gradle +++ b/publishing.gradle @@ -25,6 +25,12 @@ artifacts { archives javadocJar } +task sourceJar(type: Jar, dependsOn: 'classes') { + from sourceSets.main.allSource + classifier = 'sources' +} + + afterEvaluate { publishing { @@ -32,8 +38,8 @@ afterEvaluate { publications { release(MavenPublication) { groupId project.ext.group - artifactId project.ext.repo - version project.ext.version + artifactId ARTIFACT_ID + version PUBLISH_VERSION if (project.plugins.findPlugin("com.android.library")) { from components.release @@ -46,7 +52,7 @@ afterEvaluate { // metadata pom { - name = project.ext.repo + name = ARTIFACT_ID description = 'SDK' url = project.ext.url licenses { From 81235cf83a4b3078291a4c68a8890cd59e8d5727 Mon Sep 17 00:00:00 2001 From: Sabin Date: Mon, 28 Feb 2022 08:53:10 +1300 Subject: [PATCH 03/10] snapshot fixes --- .github/workflows/publish.yml | 2 +- .github/workflows/snapshot.yml | 2 +- common.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- publish-root.gradle | 6 +++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1538055..577cf15 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,7 +20,7 @@ jobs: java-version: 11 - name: Release build - run: ./gradlew build + run: ./gradlew clean build # Generates other artifacts - name: Source jar and dokka diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 065ec0f..7c9da43 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -24,7 +24,7 @@ jobs: java-version: 11 - name: Release build - run: ./gradlew build + run: ./gradlew clean build - name: Source jar and dokka run: ./gradlew androidSourcesJar javadocJar - name: Publish to MavenCentral diff --git a/common.gradle b/common.gradle index 7735b11..8ec5307 100644 --- a/common.gradle +++ b/common.gradle @@ -1,4 +1,4 @@ -ext.version = "1.0.3" +ext.version = "1.0.4" ext.group = "nz.co.trademe.includeme" ext.repo = "includeme" ext.scm = 'https://github.com/TradeMe/IncludeMe.git' @@ -11,4 +11,4 @@ ext.url = 'https://github.com/TradeMe/IncludeMe' ext.bintray_version = '1.7.3' ext.kotlin_version = '1.5.0' -ext.agp_version = "7.0.1" +ext.agp_version = "4.0.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 982462c..662499a 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.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip diff --git a/publish-root.gradle b/publish-root.gradle index c71c885..4b258d3 100644 --- a/publish-root.gradle +++ b/publish-root.gradle @@ -6,6 +6,7 @@ ext["signing.key"] = '' ext["ossrhUsername"] = '' ext["ossrhPassword"] = '' ext["sonatypeStagingProfileId"] = '' +ext["snapshot"] = '' File secretPropsFile = project.rootProject.file('local.properties') if (secretPropsFile.exists()) { @@ -24,7 +25,7 @@ if (secretPropsFile.exists()) { ext["snapshot"] = System.getenv('SNAPSHOT') } -if (snapshot) { +if (Boolean.parseBoolean(snapshot)) { ext["rootVersionName"] = project.ext.version + "-SNAPSHOT" } else { ext["rootVersionName"] = project.ext.version @@ -34,6 +35,9 @@ if (snapshot) { nexusPublishing { repositories { sonatype { + useStaging.set(provider { + !Boolean.parseBoolean(snapshot) + }) version = rootVersionName stagingProfileId = sonatypeStagingProfileId username = ossrhUsername From b80b5a70421090b0ecfb71b5979049c5ba8ed6bb Mon Sep 17 00:00:00 2001 From: Sabin Date: Mon, 28 Feb 2022 11:00:04 +1300 Subject: [PATCH 04/10] version update --- common.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.gradle b/common.gradle index 8ec5307..1120fe1 100644 --- a/common.gradle +++ b/common.gradle @@ -1,4 +1,4 @@ -ext.version = "1.0.4" +ext.version = "1.0.5" ext.group = "nz.co.trademe.includeme" ext.repo = "includeme" ext.scm = 'https://github.com/TradeMe/IncludeMe.git' From af2661a1472935a25899194a416dcc811f54e831 Mon Sep 17 00:00:00 2001 From: Sabin Date: Fri, 11 Mar 2022 16:45:05 +1300 Subject: [PATCH 05/10] MP-178 developer name update and version fixes --- CHANGELOG.md | 7 ++++++- common.gradle | 2 +- publishing.gradle | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1041ac..5a40ffe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Change Log ========== - + + Version 1.0.4 *(28-02-2022)* + ---------------------------- + + * Migration to maven central + Version 1.0.3 *(26-06-2018)* ---------------------------- diff --git a/common.gradle b/common.gradle index 1120fe1..8ec5307 100644 --- a/common.gradle +++ b/common.gradle @@ -1,4 +1,4 @@ -ext.version = "1.0.5" +ext.version = "1.0.4" ext.group = "nz.co.trademe.includeme" ext.repo = "includeme" ext.scm = 'https://github.com/TradeMe/IncludeMe.git' diff --git a/publishing.gradle b/publishing.gradle index e8e123b..41fa059 100644 --- a/publishing.gradle +++ b/publishing.gradle @@ -64,8 +64,8 @@ afterEvaluate { developers { developer { id = 'sabinmj' - name = 'Sabin' - email = 'sabin.mj@gmail.com' + name = 'Sabin Mulakukodiyan' + email = 'sabin.mulakukodiyan@trademe.co.nz' } // Add all other devs here... } From 87890238fe17a90e23b8442cc96b6b2371111ac5 Mon Sep 17 00:00:00 2001 From: Sabin Date: Wed, 23 Mar 2022 09:12:47 +1300 Subject: [PATCH 06/10] MP- 178 credentials made optional --- publish-root.gradle | 2 +- publishing.gradle | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/publish-root.gradle b/publish-root.gradle index 4b258d3..fe05c24 100644 --- a/publish-root.gradle +++ b/publish-root.gradle @@ -6,7 +6,7 @@ ext["signing.key"] = '' ext["ossrhUsername"] = '' ext["ossrhPassword"] = '' ext["sonatypeStagingProfileId"] = '' -ext["snapshot"] = '' +ext["snapshot"] = 'true' File secretPropsFile = project.rootProject.file('local.properties') if (secretPropsFile.exists()) { diff --git a/publishing.gradle b/publishing.gradle index 41fa059..9f62695 100644 --- a/publishing.gradle +++ b/publishing.gradle @@ -31,13 +31,14 @@ task sourceJar(type: Jar, dependsOn: 'classes') { } +group = project.ext.group afterEvaluate { publishing { publications { release(MavenPublication) { - groupId project.ext.group + groupId group artifactId ARTIFACT_ID version PUBLISH_VERSION @@ -84,12 +85,17 @@ afterEvaluate { } } signing { - useInMemoryPgpKeys( - rootProject.ext["signing.keyId"], - rootProject.ext["signing.key"], - rootProject.ext["signing.password"], - ) - sign publishing.publications + if (rootProject.ext["signing.keyId"] && rootProject.ext["signing.key"] && rootProject.ext["signing.password"]) { + useInMemoryPgpKeys( + rootProject.ext["signing.keyId"], + rootProject.ext["signing.key"], + rootProject.ext["signing.password"], + ) + sign publishing.publications + + } else { + sign configurations.archives + } } java { sourceCompatibility = JavaVersion.VERSION_1_8 From c65bcd4191f646645664e5b3c49881a6507ac9ac Mon Sep 17 00:00:00 2001 From: Sabin Date: Mon, 28 Mar 2022 14:34:01 +1300 Subject: [PATCH 07/10] MP- 178 small fixes --- README.md | 2 +- publishing.gradle | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 5f55756..db88442 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ buildscript { } dependencies { - classpath 'nz.co.trademe.includeme:includeme:1.0.3' + classpath 'nz.co.trademe.includeme:includeme:1.0.4' } } diff --git a/publishing.gradle b/publishing.gradle index 9f62695..221a460 100644 --- a/publishing.gradle +++ b/publishing.gradle @@ -25,12 +25,6 @@ artifacts { archives javadocJar } -task sourceJar(type: Jar, dependsOn: 'classes') { - from sourceSets.main.allSource - classifier = 'sources' -} - - group = project.ext.group afterEvaluate { From 2312749e0d11613ac0a671dbc554f6056312e0b3 Mon Sep 17 00:00:00 2001 From: Sabin Date: Wed, 30 Mar 2022 16:44:05 +1300 Subject: [PATCH 08/10] MP- 178 pipeline trigger branch name change --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 577cf15..de4f7a4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - 'releases/**' + - 'release/**' jobs: publish: From e99890d515cf3040c5dfed9452bc914149bf2fc9 Mon Sep 17 00:00:00 2001 From: Rick C Date: Wed, 30 Mar 2022 16:58:49 +1300 Subject: [PATCH 09/10] Update publish.yml to use 'release/' branch pattern --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 577cf15..de4f7a4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - 'releases/**' + - 'release/**' jobs: publish: From a13ae7371e757ec0aa48fe21939ffe6b00bb70f8 Mon Sep 17 00:00:00 2001 From: Sabin Date: Thu, 31 Mar 2022 09:08:56 +1300 Subject: [PATCH 10/10] MP- 178 branch name fix --- .github/workflows/publish.yml | 3 +-- .github/workflows/snapshot.yml | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index de4f7a4..3a3b974 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,8 +3,7 @@ name: Publish on: push: branches: - - main - - 'release/**' + - master jobs: publish: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 7c9da43..d60815c 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -4,11 +4,7 @@ name: Publish Snapshot builds on: push: branches: - - development - - 'snapshot/**' - - - + - 'release/**' jobs: publish: