update Android CI & Add Android publish action

Change-Id: I683e617b673bb4f243de6cafa46360cfefb506a5
yangkx-1024 · Nov 27, 2023 · 635039a · 635039a
1 parent ef41451
commit 635039a
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 27 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -26,13 +26,14 @@ jobs:
         ENCODED_STRING: ${{ secrets.KEYSTORE }}
       run: echo $ENCODED_STRING | base64 -di > ./android/app/keystore.jks
 
-    - name: Grant execute permission for gradlew
-      run: cd ./android; chmod +x gradlew
-
     - name: Build with Gradle
-      run: cd ./android; ./gradlew build
+      run: |
+        cd ./android
+        chmod +x gradlew
+        ./gradlew clean
+        ./gradlew --info assembleDebug
       env:
         SIGN_KEY_STORE_PATH: keystore.jks
         SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
         SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
-        SIGN_STORE_PASSWORD: ${{ secrets.SIGN_STORE_PASSWORD }}
+        SIGN_STORE_PASSWORD: ${{ secrets.SIGN_STORE_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,4 +14,20 @@ jobs:
       - name: Cargo publish
         run: cargo publish --token ${CARGO_REGISTRY_TOKEN}
         env:
-          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+      - name: Android publish
+        env:
+          sonatypeUsername: ${{ secrets.SONATYPEUSERNAME }}
+          sonatypePassword: ${{ secrets.SONATYPEPASSWORD }}
+          signingKeyId: ${{ secrets.GPG_KEY_ID }}
+          signingPwd: ${{ secrets.GPG_PWD }}
+          signingSecret: ${{ secrets.GPG_SECRET }}
+        run: |
+          cd ./android
+          echo ${signingSecret} | gpg --dearmor > secret.gpg
+          echo sonatypeUsername=${sonatypeUsername} >> local.properties
+          echo sonatypePassword=${sonatypePassword} >> local.properties
+          echo signing.keyId=${signingKeyId} >> local.properties
+          echo signing.secretKeyRingFile=secret.gpg >> local.properties
+          chmod +x gradlew
+          ./gradlew --info publish
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -25,11 +25,11 @@ if (propFile.exists()) {
 }
 
 android {
-    namespace = "net.yangkx.mmkv"
+    namespace = "net.yangkx.mmkv.demo"
     compileSdk = 33
 
     defaultConfig {
-        applicationId = "net.yangkx.mmkv"
+        applicationId = "net.yangkx.mmkv.demo"
         minSdk = 21
         targetSdk = 33
         versionCode = 1
@@ -54,6 +54,14 @@ android {
             )
             signingConfig = signingConfigs.getByName("release")
         }
+        create("staging") {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            signingConfig = signingConfigs.getByName("release")
+        }
         debug {
             signingConfig = signingConfigs.getByName("release")
         }
@@ -81,6 +89,8 @@ android {
 
 val defaultDebugImplementation: Configuration by configurations.creating
 val encryptionDebugImplementation: Configuration by configurations.creating
+val defaultStagingImplementation: Configuration by configurations.creating
+val encryptionStagingImplementation: Configuration by configurations.creating
 val defaultReleaseImplementation: Configuration by configurations.creating
 val encryptionReleaseImplementation: Configuration by configurations.creating
 
@@ -89,6 +99,8 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
     defaultDebugImplementation(project(":library"))
     encryptionDebugImplementation(project(":library-encrypt"))
+    defaultStagingImplementation(Deps.mmkv_snapshot)
+    encryptionStagingImplementation(Deps.mmkv_encrypt_snapshot)
     defaultReleaseImplementation(Deps.mmkv)
     encryptionReleaseImplementation(Deps.mmkv_encrypt)
 }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:name=".MyApplication"
-        android:allowBackup="true"
+        android:name="net.yangkx.mmkv.MyApplication"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
@@ -14,7 +13,7 @@
         android:theme="@style/Theme.MMKV"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name="net.yangkx.mmkv.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/android/app/src/main/java/net/yangkx/mmkv/MainActivity.kt b/android/app/src/main/java/net/yangkx/mmkv/MainActivity.kt
@@ -5,7 +5,7 @@ import android.os.Bundle
 import android.text.method.ScrollingMovementMethod
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
-import net.yangkx.mmkv.databinding.ActivityMainBinding
+import net.yangkx.mmkv.demo.databinding.ActivityMainBinding
 import net.yangkx.mmkv.log.LogLevel
 import net.yangkx.mmkv.log.Logger
 import kotlin.random.Random

diff --git a/android/buildSrc/src/main/java/Configuration.kt b/android/buildSrc/src/main/java/Configuration.kt
@@ -1,15 +1,20 @@
 object Configuration {
-    const val versionStr = "0.2.8"
-//    const val libVersion = versionStr + "-SNAPSHOT"
-    const val libVersion = versionStr
+    val snapshotVersion = version + "-SNAPSHOT"
+    val releaseVersion = version
+    val libVersion: String
+        get() = if (System.getenv("CI")?.toBoolean() ?: false){
+            releaseVersion
+        } else {
+            snapshotVersion
+        }
     const val groupId = "net.yangkx"
     const val description = "Library uses file-based mmap to store key-values"
     private const val releasesRepoUrl = "https://s01.oss.sonatype.org/content/repositories/releases/"
     private const val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-    val publishUrl = if (libVersion.endsWith("-SNAPSHOT")) {
-        snapshotsRepoUrl
-    } else {
+    val publishUrl = if (System.getenv("CI")?.toBoolean() ?: false) {
         releasesRepoUrl
+    } else {
+        snapshotsRepoUrl
     }
     val licenceApache = "The Apache License, Version 2.0" to "http://www.apache.org/licenses/LICENSE-2.0.txt"
     val licenceMit = "The MIT License" to "https://opensource.org/licenses/MIT"
@@ -19,6 +24,8 @@ object Configuration {
 
 object Deps {
     val kotlin = "androidx.core:core-ktx:1.10.1"
-    val mmkv = "net.yangkx:mmkv:${Configuration.libVersion}"
-    val mmkv_encrypt = "net.yangkx:mmkv-encrypt:${Configuration.libVersion}"
+    val mmkv_snapshot = "net.yangkx:mmkv:${Configuration.snapshotVersion}"
+    val mmkv_encrypt_snapshot = "net.yangkx:mmkv-encrypt:${Configuration.snapshotVersion}"
+    val mmkv = "net.yangkx:mmkv:${Configuration.releaseVersion}"
+    val mmkv_encrypt = "net.yangkx:mmkv-encrypt:${Configuration.releaseVersion}"
 }
diff --git a/android/buildSrc/src/main/java/Version.kt b/android/buildSrc/src/main/java/Version.kt
@@ -0,0 +1 @@
+const val version = "0.2.8"
diff --git a/android/library-encrypt/build.gradle.kts b/android/library-encrypt/build.gradle.kts
@@ -61,7 +61,7 @@ publishing {
     val artifactId = "mmkv-encrypt"
     publications {
         register<MavenPublication>("release") {
-            groupId = "net.yangkx"
+            groupId = Configuration.groupId
             this.artifactId = artifactId
             this.version = Configuration.libVersion
 

diff --git a/android/library-encrypt/src/main/AndroidManifest.xml b/android/library-encrypt/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.yangkx.mmkv">
+<manifest>
 </manifest>
diff --git a/android/library/build.gradle.kts b/android/library/build.gradle.kts
@@ -59,12 +59,11 @@ dependencies {
 
 publishing {
     val artifactId = "mmkv"
-    val version = Configuration.libVersion
     publications {
         register<MavenPublication>("release") {
             groupId = Configuration.groupId
             this.artifactId = artifactId
-            this.version = version
+            this.version = Configuration.libVersion
 
             afterEvaluate {
                 from(components["release"])

diff --git a/android/library/src/main/AndroidManifest.xml b/android/library/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.yangkx.mmkv">
+<manifest>
 </manifest>