update actions

.github/workflows/android.yml

@@ -1,48 +0,0 @@
-name: Android CI
-
-on:
-  release:
-    types: [published]
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '1.8'
-        distribution: 'adopt'
-        
-    # 获取打包秘钥
-    - name: Checkout Android Keystore
-      uses: actions/checkout@v2
-      with:
-        repository: 存储android打包用的key的仓库（格式：用户名/仓库名）
-        token: ${{ secrets.TOKEN }} # 连接仓库的token,需要单独配置
-        path: keystore # 仓库的根目录名
-    # 打包release
-    - name: Build with Gradle
-      run: bash ./gradlew assembleRelease
-    # 创建release
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: v${{ github.ref }}
-        release_name: FYReader_v${{ github.ref }}
-        draft: false
-        prerelease: false
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build

.github/workflows/reader.yml

@@ -0,0 +1,35 @@
+name: Android CI
+
+on:
+  release:
+    types: [published]
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    # 获取打包秘钥
+    - name: Checkout Android Keystore
+      uses: actions/checkout@v2
+      with:
+        repository: fengyuecanzhu/Key
+        token: ${{ secrets.KEY_TOKEN }} # 连接仓库的token,需要单独配置
+        path: keystore # 仓库的根目录名
+    # 打包release
+    - name: Build With Gradle
+        run: |
+          echo "开始进行release构建"
+          chmod +x gradlew
+          ./gradlew assembleAppRelease --parallel
+    - name: Upload App To Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: fyreader apk
+          path: ${{ github.workspace }}/app/build/outputs/apk/app/release/*.apk

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "keystore"]
-	path = keystore
-	url = https://github.com/fengyuecanzhu/Key.git

.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/keystore" vcs="Git" />
   </component>
 </project>

app/build.gradle

@@ -89,7 +89,9 @@ android {
             ndk {
                 abiFilters "x86", "armeabi", "armeabi-v7a"
             }
-            signingConfig signingConfigs.myConifg
+            if (keyPropsFile.exists()) {
+                signingConfig signingConfigs.myConifg
+            }
         }
         debug {
             ndk {
@@ -97,7 +99,9 @@ android {
             }
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.myConifg
+            if (keyPropsFile.exists()) {
+                signingConfig signingConfigs.myConifg
+            }
         }
         android.applicationVariants.all { variant ->
             variant.outputs.all {

keystore

@@ -1 +0,0 @@
-Subproject commit d46d54c2573c77713809f1061aef135c305bc9f4