diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml index 147245e..c5dd721 100644 --- a/.github/workflows/publish-android.yml +++ b/.github/workflows/publish-android.yml @@ -32,11 +32,4 @@ jobs: echo "local.properties file has been created successfully." - name: Run publish script working-directory: ./scripts - env: - ANDROID_OSSRH_USERNAME: ${{ secrets.ANDROID_OSSRH_USERNAME }} - ANDROID_OSSRH_PASSWORD: ${{ secrets.ANDROID_OSSRH_PASSWORD }} - ANDROID_SIGNING_KEY_ID: ${{ secrets.ANDROID_SIGNING_KEY_ID }} - ANDROID_SIGNING_PASSWORD: ${{ secrets.ANDROID_SIGNING_PASSWORD }} - ANDROID_SIGNING_KEY: ${{ secrets.ANDROID_SIGNING_KEY }} - ANDROID_SONATYPE_STAGING_PROFILE_ID: ${{ secrets.ANDROID_SONATYPE_STAGING_PROFILE_ID }} run: ./publish-android.sh \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8771192..cf1c06c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +- Update `publish-android` workflow to publish library under io.ionic.libs (https://outsystemsrd.atlassian.net/browse/RMET-3982) + ## 1.2.1 - Remove unnecessary permissions from AndroidManifest (https://outsystemsrd.atlassian.net/browse/RMET-3987) diff --git a/pom.xml b/pom.xml index f819be6..93f52b9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.github.outsystems - osinappbrowser-android + io.ionic.libs + ioninappbrowser-android 1.2.1 diff --git a/scripts/publish-android.sh b/scripts/publish-android.sh index 0067146..d44308d 100755 --- a/scripts/publish-android.sh +++ b/scripts/publish-android.sh @@ -5,7 +5,7 @@ LOG_OUTPUT=./tmp/publish-android.txt THE_VERSION=`sed -n 's/.*\(.*\)<\/version>.*/\1/p' ../pom.xml` # Get latest io.ionic:portals XML version info -PUBLISHED_URL="https://repo1.maven.org/maven2/com/capacitorjs/osinappbrowser-android/maven-metadata.xml" +PUBLISHED_URL="https://repo1.maven.org/maven2/io/ionic/libs/ioninappbrowser-android/maven-metadata.xml" PUBLISHED_DATA=$(curl -s $PUBLISHED_URL) PUBLISHED_VERSION="$(perl -ne 'print and last if s/.*(.*)<\/latest>.*/\1/;' <<< $PUBLISHED_DATA)" @@ -20,7 +20,9 @@ else export SHOULD_PUBLISH=true printf %"s\n" "Attempting to build and publish version $THE_VERSION" + # Publish a release to the Maven repo "$ANDROID_PATH"/gradlew clean build publishReleasePublicationToSonatypeRepository closeAndReleaseSonatypeStagingRepository --no-daemon --max-workers 1 -b "$ANDROID_PATH"/build.gradle -Pandroid.useAndroidX=true > $LOG_OUTPUT 2>&1 + # Stage a version # "$ANDROID_PATH"/gradlew clean build publishReleasePublicationToSonatypeRepository --no-daemon --max-workers 1 -b "$ANDROID_PATH"/build.gradle -Pandroid.useAndroidX=true > $LOG_OUTPUT 2>&1 echo $RESULT diff --git a/scripts/publish-module.gradle b/scripts/publish-module.gradle index d54ab16..ac5c532 100644 --- a/scripts/publish-module.gradle +++ b/scripts/publish-module.gradle @@ -18,7 +18,7 @@ artifacts { archives androidSourcesJar } -group = 'com.capacitorjs' +group = 'io.ionic.libs' version = LIB_VERSION afterEvaluate { @@ -26,8 +26,8 @@ afterEvaluate { publications { release(MavenPublication) { // Coordinates - groupId 'com.capacitorjs' - artifactId 'osinappbrowser-android' + groupId 'io.ionic.libs' + artifactId 'ioninappbrowser-android' version LIB_VERSION // Two artifacts, the `aar` (or `jar`) and the sources @@ -41,7 +41,7 @@ afterEvaluate { // POM Data pom { - name = 'osinappbrowser-android' + name = 'ioninappbrowser-android' description = 'InAppBrowser Android Lib' url = 'https://github.com/OutSystems/OSInAppBrowserLib-Android' licenses {