[feature] 1.新架构

easybangumiorg · Dec 26, 2023 · c3dd96d · c3dd96d
1 parent 4b0a612
commit c3dd96d
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 149 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,34 @@
+name: release
+on:
+  push:
+    tags:
+      - '**'
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - name: Setup Java JDK
+        uses: actions/[email protected]
+        with:
+          java-version: 17
+      - name: Build
+        run: |
+          chmod a+x ./gradlew
+          ./gradlew :app:assemble
+      - name: sign-apk
+        uses: r0adkll/sign-android-release@v1
+        with:
+          releaseDirectory: app/build/outputs/apk/release
+          signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+          alias: ${{ secrets.KEY_ALIAS }}
+          keyStorePassword: ${{ secrets.KEY_STORE_PWD }}
+          keyPassword: ${{ secrets.KEY_PWD }}
+      - name: rename-apk
+        run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk easybangumi-${{ github.ref_name }}.apk
+      - name: Release
+        run: |
+          gh release create -d ${{ github.ref_name }} kan-animation-${{ github.ref_name }}.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/app-old/build.gradle.kts b/app-old/build.gradle.kts
@@ -1,6 +1,5 @@
 
 import com.heyanle.buildsrc.Android
-import com.heyanle.buildsrc.Config
 import com.heyanle.buildsrc.RoomSchemaArgProvider
 import com.heyanle.buildsrc.project
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,15 +1,21 @@
 
 import com.heyanle.buildsrc.Android
-import com.heyanle.buildsrc.Config
 import com.heyanle.buildsrc.RoomSchemaArgProvider
-import com.heyanle.buildsrc.project
+import java.util.Properties
 
 plugins {
     alias(build.plugins.android.application)
     alias(build.plugins.kotlin.android)
     alias(build.plugins.ksp)
 }
 
+val publishingProps = Properties()
+runCatching {
+    publishingProps.load(project.rootProject.file("publishing/publishing.properties").inputStream())
+}.onFailure {
+    // it.printStackTrace()
+}
+
 android {
     namespace = "com.heyanle.easybangumi4"
     compileSdk = Android.compileSdk
@@ -26,11 +32,13 @@ android {
         vectorDrawables {
             useSupportLibrary = true
         }
-
         buildConfigField(
             "String",
-            Config.APP_CENTER_SECRET,
-            "\"${Config.getPrivateValue(Config.APP_CENTER_SECRET)}\""
+            "app_center_secret",
+            publishingProps.getProperty(
+                "APP_CENTER_SECRET",
+                System.getenv("APPCENTER_SECRET")
+            )?:""
         )
 
         ksp {

diff --git a/buildSrc/src/main/java/com/heyanle/buildsrc/Config.kt b/buildSrc/src/main/java/com/heyanle/buildsrc/Config.kt
diff --git a/buildSrc/src/main/java/com/heyanle/buildsrc/Const.kt b/buildSrc/src/main/java/com/heyanle/buildsrc/Const.kt
diff --git a/buildSrc/src/main/java/com/heyanle/buildsrc/Dependency.kt b/buildSrc/src/main/java/com/heyanle/buildsrc/Dependency.kt
diff --git a/buildSrc/src/main/java/com/heyanle/buildsrc/SourceExtension.kt b/buildSrc/src/main/java/com/heyanle/buildsrc/SourceExtension.kt
diff --git a/easy-dlna/build.gradle.kts b/easy-dlna/build.gradle.kts
@@ -1,5 +1,4 @@
 
-import com.heyanle.buildsrc.implementation
 
 plugins {
     alias(build.plugins.android.library)
@@ -37,7 +36,6 @@ android {
 
 dependencies {
     implementation(libs.bundles.cling)
-    implementation("org.fourthline.cling:cling-support:${com.heyanle.buildsrc.Version.cling}")
     //jetty()
     //servlet()
     implementation(files("libs/javax.servlet-3.0.0.v201103241009.jar"))