1、使用productFlavor区分测试版和正式版的包名和应用名

archurcode · archurcode · commit 393e7bf44c32 · 2020-06-23T15:29:07.000+08:00
2、apk名称增加时间戳
3、应用versionname追加short commit id
4、上传经加密的密钥以及配置文件

Change-Id: I454c9fc1033dd3c0a030125e9750d34a22830b9c
diff --git a/.github/app-config.json.asc b/.github/app-config.json.asc
@@ -0,0 +1,9 @@
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCcddlN4+c7mrs0sANAU7MDJWpUv5zKTp4Yuac7gaXh95BWaod5kiVY3Qz
+HfK12u8HcXevdDGloFRV+lXIsY1G979/ckIVrXCYvVvVWL1LudgaXQRpIUOX1T8F
+B91/i/Y7Xqy2R5LNl7I37dzGbFYLhcFkqAx2I6lWEZOkUUEIJ6hx3JfF16+WUYyW
+T5i2Q70YR4rEp5FUSLLWcCgv0kofvoMOz6zkws2L+sZhYLVRD/nqpK9fenidsoqx
++h+KQaTQHSbqwb6o/9XGS2st3N2YqenHEQLTzp16mw==
+=41gE
+-----END PGP MESSAGE-----
diff --git a/.github/app/google-services.json.asc b/.github/app/google-services.json.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCluhfHKwgO/Ps0ukB6aQbVz9uxEbqhS12eNCGBWtSw3wzMJJIRMf4sThb
+MkX0e8yC5pV1C6zfn+xaqWEv1WU7UqLCjzmJ9Rof6A64ZNruc97Ph3sLMThSRdM8
+roNpsHTxOtDfTri454By35bVIUtrzQjbiqNwWaEbF5uykI0F/U5XA/k/EASs9IcY
+8KwewSealuQaeDCHH9WALoBJTFRY5aIbX/6EYI+Afipc7nkd4EVhCZFnynnN4YqL
+A1I6/Hj2ctZJxNW1mF92IJY8T7lHFM7pncDK0l7WmO8r5/BWjFwnDDlg9kuUJQkI
+F8T1KV+F4rYqRRsaBFt89cbkGVMZdewom2gAKBRvFjEgQclKU+ns1vofeXCJupk2
+45FkgJoxwtNZ/VgFT66YfxuWo86NenzwxTRBaEf52gCYozErViiBX7un9fxTWTyJ
+gYF2bv1Hhm4Wgo8dIAJ5wfB3PxqotqGrC4fPHp2/rwJOYGcvNlaiG1D42XXXqwgf
+wiYwbZrV6lJkrGm26u5/s3OFWdBDw7ySjnfe8vNxkyY5l4kh4Fmpsm1vLsXTre8T
+ecrwvcISXxDNeeGx6vOpVArnhDAiWqXucg/XYcfm34srDXIDZI9VMvoJJLudX2NV
+cGLyDFOnYnU5pATvcmWenKiVFAxt6V/nXmDLB0ovmyfCu7534Vep0/MBFEgg7GTc
+MHZKguSmRRY9GVRd+mx8AQmCBUXD/FUgYt3AM8T0UjZODiy2z+lKQdAeq7PaINFI
+5nbIjlrjV1Bi5hFMVGEnZMPVoqYlevAmJ+kQjDprejwBmZcBZo9Owk+AZKccvO+A
+mevTd533vA50JaU3rfduFO1tUTDhMsc7
+=uj+6
+-----END PGP MESSAGE-----
diff --git a/.github/tencent_official_keystore.jks.asc b/.github/tencent_official_keystore.jks.asc
diff --git a/.github/workflows/opensource.yml b/.github/workflows/opensource.yml
@@ -25,10 +25,14 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build
       - name: Package apk and aar with Gradle
-        run: ./gradlew assembleDebug
+        run: ./gradlew assembleOpensource
       - name: Publish aar to Maven
         run: ./gradlew publish
+      - name: Archive the apk
+        uses: actions/upload-artifact@v2
+        with:
+          path: app/build/outputs/apk/opensource/release/*.apk
       - name: Upload apk to PGY
         run: |
-          mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/iot-link-android.apk
-          curl -F 'file=@app/build/outputs/apk/debug/iot-link-android.apk' -F '_api_key=${{ secrets.RELEASE_PGYER_API_KEY }}' https://www.pgyer.com/apiv2/app/upload
+          apk=$(ls app/build/outputs/apk/opensource/release/*.apk)
+          curl -F "file=@${apk}" -F '_api_key=${{ secrets.RELEASE_PGYER_API_KEY }}' https://www.pgyer.com/apiv2/app/upload
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,25 +17,34 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - run:
-          gpg -d --passphrase "${{ secrets.GPG_DECRYPT_PASSPHRASE }}" --batch release_keystore.jks.asc > release_keystore.jks
+      - run: |
+          rm -rf opensource_keystore.jks app-config.json app/google-services.json
+          gpg -d --passphrase "${{ secrets.GPG_DECRYPT_PASSPHRASE }}" --batch .github/tencent_official_keystore.jks.asc > tencent_official_keystore.jks
+          gpg -d --passphrase "${{ secrets.GPG_DECRYPT_PASSPHRASE }}" --batch .github/app-config.json.asc > app-config.json
+          gpg -d --passphrase "${{ secrets.GPG_DECRYPT_PASSPHRASE }}" --batch .github/app/google-services.json.asc > app/google-services.json
       - name: set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
       - name: Adapt build.gradle from debug to release
         run: |
-          sed -i 's#opensource_keystore#release_keystore#g' app/build.gradle
+          sed -i 's#opensource_keystore#tencent_official_keystore#g' app/build.gradle
+          sed -i '/opensource {/, +3d' app/build.gradle
+          sed -i 's#//*##g' app/build.gradle
           sed -i "s#'111222'#System.getenv(\"RELEASE_KEYSTORE_PASSWORD\")#g" app/build.gradle
           sed -i 's#sdk-debug#sdk-release#g' sdk/build.gradle
           sed -i 's#-SNAPSHOT##g' sdk/build.gradle
       - name: Build with Gradle
         run: ./gradlew build
       - name: Package apk and aar with Gradle
-        run: ./gradlew assembleRelease
+        run: ./gradlew assembleTencentOfficial
       - name: Publish aar to Maven
         run: ./gradlew publish
+      - name: Archive the apk
+        uses: actions/upload-artifact@v2
+        with:
+          path: app/build/outputs/apk/tencentOfficial/release/*.apk
       - name: Upload apk to PGY
         run: |
-          mv app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/iot-link-android.apk
-          curl -F 'file=@app/build/outputs/apk/release/iot-link-android.apk' -F '_api_key=${{ secrets.RELEASE_PGYER_API_KEY }}' https://www.pgyer.com/apiv2/app/upload
+          apk=$(ls app/build/outputs/apk/tencentOfficial/release/*.apk)
+          curl -F "file=@${apk}" -F '_api_key=${{ secrets.RELEASE_PGYER_API_KEY }}' https://www.pgyer.com/apiv2/app/upload
diff --git a/app/build.gradle b/app/build.gradle
@@ -46,6 +46,19 @@ android {
         buildConfigField 'String', 'TencentIotLinkAppSecrect', "\"${getValueById('TencentIotLinkAppSecrect')}\""
         multiDexEnabled true
     }
+
+    flavorDimensions "version"
+    productFlavors {
+        opensource {
+            applicationId "com.tencent.iot.explorer.link.opensource"
+            resValue("string" , "app_name","连连开源体验")
+        }
+        //*tencentOfficial {
+        //*    applicationId "com.tencent.iot.explorer.link"
+        //*    resValue("string" , "app_name","腾讯连连")
+        //*}
+    }
+
     buildTypes {
         debug {
             signingConfig signingConfigs.config
@@ -65,6 +78,12 @@ android {
     repositories {
         flatDir { dirs 'libs' }
     }
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            def date = new Date().format("yyyyMMddHHmmss" , TimeZone.getTimeZone("GMT+08"))
+            outputFileName = "iot-link-android-${date}.apk"
+        }
+    }
 }
 
 dependencies {
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
@@ -2,5 +2,4 @@
     <!-- Example customization of dimensions originally defined in res/values/dimens.xml
          (such as screen margins) for screens with more than 820dp of available width. This
          would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,4 @@
 <resources>
-    <string name="app_name">腾讯连连</string>
-
     <!--  主页面 -->
     <string name="main_tab_1">首页</string>
     <string name="main_tab_2">场景</string>
diff --git a/config.gradle b/config.gradle
@@ -1,6 +1,7 @@
+def gitCommitShortHash = 'git log -1 --pretty=%h'.execute([], project.rootDir).text.trim()
 ext {
     android = [
-            versionName: "1.0.24",
-            versionCode: 24
+            versionName: "1.0.0." + gitCommitShortHash,
+            versionCode: 1
     ]
 }
diff --git a/opensource_keystore.jks b/opensource_keystore.jks

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
	`1`	`+def gitCommitShortHash = 'git log -1 --pretty=%h'.execute([], project.rootDir).text.trim()`
`1`	`2`	`ext {`
`2`	`3`	`android = [`
`3`		`- versionName: "1.0.24",`
`4`		`- versionCode: 24`
	`4`	`+ versionName: "1.0.0." + gitCommitShortHash,`
	`5`	`+ versionCode: 1`
`5`	`6`	`]`
`6`	`7`	`}`