Update project

michaelbel · Nov 16, 2024 · 5a4b42b · 5a4b42b
1 parent f6df005
commit 5a4b42b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -82,14 +82,21 @@ jobs:
       - name: set decoded file location as environment
         run: echo "KEYSTORE_FILE=${{ steps.decode_keystore_file.outputs.filePath }}" >> $GITHUB_ENV
 
-      - name: assemble android gms debug artifact
-        run: ./gradlew androidApp:assembleGmsDebug
+#      - name: assemble android gms debug artifact
+#        run: ./gradlew androidApp:assembleGmsDebug
 
-      - name: assemble android hms debug artifact
-        run: ./gradlew androidApp:assembleHmsDebug
+#      - name: assemble android hms debug artifact
+#        run: ./gradlew androidApp:assembleHmsDebug
 
-      - name: assemble android foss debug artifact
-        run: ./gradlew androidApp:assembleFossDebug
+#      - name: assemble android foss debug artifact
+#        run: ./gradlew androidApp:assembleFossDebug
+
+      - name: assemble android debug artifacts
+        run: |
+          ./gradlew \
+            androidApp:assembleGmsDebug \
+            androidApp:assembleHmsDebug \
+            androidApp:assembleFossDebug
 
 #      - name: assemble gms release artifact
 #        run: ./gradlew androidApp:assembleGmsRelease
@@ -129,7 +136,7 @@ jobs:
         run: |
           echo "GMS_DEBUG_APK_PATH=$(find androidApp/build/outputs/apk/gms/debug -name '*.apk' -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -d' ' -f2)" >> $GITHUB_ENV
           echo "HMS_DEBUG_APK_PATH=$(find androidApp/build/outputs/apk/hms/debug -name '*.apk' -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -d' ' -f2)" >> $GITHUB_ENV
-          echo "FOSS_DEBUG_APK_PATH=$(find androidApp/build/outputs/apk/hms/debug -name '*.apk' -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -d' ' -f2)" >> $GITHUB_ENV
+          echo "FOSS_DEBUG_APK_PATH=$(find androidApp/build/outputs/apk/foss/debug -name '*.apk' -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -d' ' -f2)" >> $GITHUB_ENV
 
       - name: send android telegram message gms debug
         env:

diff --git a/androidApp/proguard-rules.pro b/androidApp/proguard-rules.pro
@@ -25,4 +25,9 @@
 # @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
 -keepattributes RuntimeVisibleAnnotations,AnnotationDefault
 
--dontwarn org.slf4j.impl.StaticLoggerBinder
+-dontwarn org.slf4j.impl.StaticLoggerBinder
+
+-keep class io.ktor.utils.io.jvm.nio.** { *; }
+-keep class io.ktor.utils.io.** { *; }
+
+-keep class coil3.network.ktor.internal.UtilsKt { *; }