diff --git a/.github/workflows/android_build.yml b/.github/workflows/master_pull_request.yml similarity index 94% rename from .github/workflows/android_build.yml rename to .github/workflows/master_pull_request.yml index d6969ce..08f60e4 100644 --- a/.github/workflows/android_build.yml +++ b/.github/workflows/master_pull_request.yml @@ -1,8 +1,6 @@ -name: Android Build CI +name: Master pull request CI on: - push: - branches: [ master ] pull_request: branches: [ master ] diff --git a/.github/workflows/master_push.yml b/.github/workflows/master_push.yml new file mode 100644 index 0000000..9bd2699 --- /dev/null +++ b/.github/workflows/master_push.yml @@ -0,0 +1,32 @@ +name: Master push CI + +on: + push: + branches: [ master ] + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + build-qa-debug: + runs-on: [ default ] + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Log Build Metadata + run: | + echo "Commit SHA: ${{ github.sha }}" + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: 11 + distribution: adopt + - name: Setup Android SDK + uses: android-actions/setup-android@v2 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Assemble with Stacktrace + run: ./gradlew assembleDebug --stacktrace + - name: Upload to nexus + run: ./gradlew publish -PIS_PUSH=true -PNEXUS_URL=https://nexus.cmd.navi-tech.in/repository/maven-releases -PNEXUS_USERNAME=${{ secrets.NEXUS_USERNAME }} -PNEXUS_PASSWORD=${{ secrets.NEXUS_PASSWORD }} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index b853faf..4f55a2e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,11 +4,11 @@ plugins { } android { - namespace 'com.navi.uitron' + namespace 'com.navi' compileSdk 32 defaultConfig { - applicationId "com.navi.uitron" + applicationId "com.navi" minSdk 21 targetSdk 32 versionCode 1 diff --git a/app/src/main/java/com/navi/uitron/Utils.kt b/app/src/main/java/com/navi/uitron/Utils.kt index 24e820a..89090ea 100644 --- a/app/src/main/java/com/navi/uitron/Utils.kt +++ b/app/src/main/java/com/navi/uitron/Utils.kt @@ -16,7 +16,7 @@ import java.lang.reflect.Type import java.nio.charset.StandardCharsets fun mockApiResponse(context: Context, type: Type, jsonKey: String): T { - val inputStream = context.resources.openRawResource(com.navi.uitron.R.raw.mock) + val inputStream = context.resources.openRawResource(R.raw.mock) val dataString = String(inputStream.readBytes(), StandardCharsets.UTF_8) val jsonElement = (JsonParser.parseString(dataString) as? JsonObject)?.get(jsonKey) val customGson = diff --git a/navi-uitron/build.gradle b/navi-uitron/build.gradle index bbbefcd..259e5f4 100644 --- a/navi-uitron/build.gradle +++ b/navi-uitron/build.gradle @@ -57,8 +57,13 @@ publishing { maven(MavenPublication) { artifactId = "uitron" groupId = "com.navi.medici" - version = "navi_v$VERSION_NAME-SNAPSHOT" - artifact("build/outputs/aar/navi-uitron-debug.aar") + if ($IS_PUSH) { + version = "navi_v$VERSION_NAME" + artifact("build/outputs/aar/navi-uitron-release.aar") + } else { + version = "navi_v$VERSION_NAME-SNAPSHOT" + artifact("build/outputs/aar/navi-uitron-debug.aar") + } } } }