release snutt 3.3.0 (#223)

wafflestudio · Sep 18, 2023 · 8f5a088 · 8f5a088
1 parent eb82649
commit 8f5a088
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Clean build
         run: ./gradlew clean
@@ -75,7 +75,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
       - name: Clean build
         run: ./gradlew clean
@@ -111,10 +111,10 @@ jobs:
       - name: Upload artifact to Firebase App Distribution
         run: ./gradlew appDistributionUploadStagingRelease
       - name: Slack Upload APK
-        uses: MeilCli/slack-upload-file@v1
+        uses: MeilCli/slack-upload-file@v3
         with:
           slack_token: ${{ secrets.SLACK_READ_WRITE_TOKEN }}
-          channels: ${{ secrets.SLACK_DEPLOY_CHANNEL }}
+          channel_id: ${{ secrets.SLACK_DEPLOY_CHANNEL_ID }}
           file_path: './app/build/outputs/apk/staging/release/app-staging-release.apk'
           file_name: 'app-staging-release.apk'
           file_type: 'apk'

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -63,7 +63,8 @@ android {
         }
 
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,3 +1,17 @@
 # Proguard for firebase crashlytics (https://firebase.google.com/docs/crashlytics/get-deobfuscated-reports?platform=android)
 -keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
 -keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+
+# class stored to sharedPreference after serialization
+-keep public enum com.wafflestudio.snutt2.** { *; }
+-keep class com.wafflestudio.snutt2.lib.** { *; }
+-keep class com.wafflestudio.snutt2.model.** { *; }
+
+# https://github.com/square/retrofit/issues/3751#issuecomment-1192043644
+# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
diff --git a/app/src/main/java/com/wafflestudio/snutt2/views/logged_in/vacancy_noti/VacancyViewModel.kt b/app/src/main/java/com/wafflestudio/snutt2/views/logged_in/vacancy_noti/VacancyViewModel.kt
@@ -15,6 +15,7 @@ import javax.inject.Inject
 @HiltViewModel
 class VacancyViewModel @Inject constructor(
     private val vacancyRepository: VacancyRepository,
+    private val apiOnError: ApiOnError,
 ) : ViewModel() {
     private val _vacancyLectures =
         MutableStateFlow<List<LectureDto>>(listOf())
@@ -30,9 +31,6 @@ class VacancyViewModel @Inject constructor(
     val firstVacancyVisit
         get() = vacancyRepository.firstVacancyVisit
 
-    @Inject
-    lateinit var apiOnError: ApiOnError
-
     init {
         viewModelScope.launch {
             try {

diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-snuttVersionName=3.2.3
+snuttVersionName=3.3.0