Merge pull request #177 from EAT-SSU/fix/code

[Fix/setting] AGP 8.2.2

.github/workflows/android.yml

@@ -36,10 +36,12 @@ jobs:
 
     - name: Access Local Properties
       env:
-        BASE_URL: ${{ secrets.BASE_URL }}
+        DEV_BASE_URL: ${{ secrets.DEV_BASE_URL }}
+        PROD_BASE_URL: ${{ secrets.PROD_BASE_URL }}
         KAKAO_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }}
       run: |
-        echo BASE_URL=\"$BASE_URL\" >> local.properties
+        echo DEV_BASE_URL=\"$DEV_BASE_URL\" >> local.properties
+        echo PROD_BASE_URL=\"$PROD_BASE_URL\" >> local.properties
         echo KAKAO_NATIVE_APP_KEY=$KAKAO_NATIVE_APP_KEY >> local.properties
   
     - name: Generate google-services.json

app/build.gradle

@@ -26,21 +26,25 @@ android {
         versionName "1.1.9"
 
 
-        buildConfigField "String", "BASE_URL", properties["BASE_URL"]
-
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", "\"${properties.get('KAKAO_NATIVE_APP_KEY')}\"")
         manifestPlaceholders = [KAKAO_NATIVE_APP_KEY: properties.get('KAKAO_NATIVE_APP_KEY')]
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildFeatures {
+        buildConfig = true
         viewBinding = true
         dataBinding = true
     }
 
     buildTypes {
+        debug {
+            buildConfigField("String", "BASE_URL", properties["DEV_BASE_URL"])
+        }
         release {
+            buildConfigField("String", "BASE_URL", properties["PROD_BASE_URL"])
+
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -110,11 +114,6 @@ dependencies {
     kapt "com.google.dagger:hilt-android-compiler:2.50"
     annotationProcessor 'com.google.dagger:hilt-compiler:2.50'
 
-//    implementation "androidx.hilt:hilt-common:1.2.0"
-//    implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03"
-//    kapt "androidx.hilt:hilt-compiler:1.2.0"
-
-
     // viewmodel과 livedata
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"

app/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.eatssu.android",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 11,
+      "versionName": "1.1.9",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/src/main/java/com/eatssu/android/ui/common/VersionViewModel.kt

@@ -30,9 +30,6 @@ class VersionViewModel(private val repository: FirebaseRemoteConfigRepository) :
         return false
     }
 
-    fun checkAppVersion(): String {
-        return repository.getAppVersion()
-    }
 
     fun checkVersionCode(): Long {
         return repository.getVersionCode()

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
+    id 'com.android.application' version '8.2.2' apply false
+    id 'com.android.library' version '8.2.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
     id 'com.google.gms.google-services' version "4.3.15" apply false
     id 'com.google.firebase.crashlytics' version "2.9.9" apply false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Fri Feb 17 11:26:14 KST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME