[FIX] #7 - release 버전 시도 / signed을 위한 코드 추가

SW-Marastro · Jul 8, 2024 · df16331 · df16331
1 parent 2c1a5eb
commit df16331
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 40 deletions.
diff --git a/.github/workflows/android_ci_cd.yml b/.github/workflows/android_ci_cd.yml
@@ -43,25 +43,25 @@ jobs:
       run: ./gradlew clean
 
     # Generate Keystore File
-#    - name: Generate Keystore File
-#      env:
-#        KEY_STORE: ${{ secrets.APP_KEYSTORE_BASE64 }}
-#      run: |
-#        echo $KEY_STORE > ./keystore.b64
-#        base64 -d -i ./keystore.b64 > ./release.keystore
+    - name: Generate Keystore File
+      env:
+        KEY_STORE: ${{ secrets.APP_KEYSTORE_BASE64 }}
+      run: |
+        echo $KEY_STORE > ./keystore.b64
+        base64 -d -i ./keystore.b64 > ./release.keystore
 
     # Generate keystore.properties
-#    - name: Generate keystore.properties
-#      env:
-#        STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
-#        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-#        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-#        STORE_FILE: ${{ secrets.STORE_FILE }}
-#      run: |
-#        echo storePassword=$STORE_PASSWORD > ./keystore.properties
-#        echo keyPassword=$KEY_PASSWORD > ./keystore.properties
-#        echo keyAlias=$KEY_ALIAS > ./keystore.properties
-#        echo storeFile=$STORE_FILE > ./keystore.properties
+    - name: Generate keystore.properties
+      env:
+        STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+        STORE_FILE: ${{ secrets.STORE_FILE }}
+      run: |
+        echo storePassword=$STORE_PASSWORD > ./keystore.properties
+        echo keyPassword=$KEY_PASSWORD > ./keystore.properties
+        echo keyAlias=$KEY_ALIAS > ./keystore.properties
+        echo storeFile=$STORE_FILE > ./keystore.properties
       
     # Build APK Release
     - name: Build Release Apk

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,9 +5,9 @@ plugins {
     id 'dagger.hilt.android.plugin'
 }
 
-//def keystorePropertiesFile = project.rootProject.file("keystore.properties")
-//def keystoreProperties = new Properties()
-//keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+def keystorePropertiesFile = project.rootProject.file("keystore.properties")
+def keystoreProperties = new Properties()
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     namespace 'com.swmarastro.mykkumi.android'
@@ -24,14 +24,14 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
-//    signingConfigs {
-//        config {
-//            keyAlias keystoreProperties['keyAlias']
-//            keyPassword keystoreProperties['keyPassword']
-//            storeFile file(keystoreProperties['storeFile'])
-//            storePassword keystoreProperties['storePassword']
-//        }
-//    }
+    signingConfigs {
+        config {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
 
     buildTypes {
         release {
@@ -40,14 +40,14 @@ android {
             manifestPlaceholders = [
                     appName : "@string/app_name"
             ]
-//            signingConfig signingConfigs.config
+            signingConfig signingConfigs.config
         }
-        /*debug {
+        debug {
             applicationIdSuffix '.dev'
             manifestPlaceholders = [
                     appName : "@string/app_name_dev"
             ]
-        }*/
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17

diff --git a/core/data/build.gradle b/core/data/build.gradle
@@ -23,21 +23,21 @@ android {
         targetSdk target_sdk_version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        def baseUrl = properties.getProperty('api.baseurl', '')
+        println "BASE_URL: ${baseUrl}"
+
+        if (!baseUrl.isEmpty()) {
+            buildConfigField "String", 'BASE_URL', "${properties.getProperty('api.baseurl', '')}"
+        } else {
+            throw new GradleException("BASE_URL is not set in local.properties")
+        }
     }
 
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-
-            def baseUrl = properties.getProperty('api.baseurl', '')
-            println "BASE_URL: ${baseUrl}"
-
-            if (!baseUrl.isEmpty()) {
-                buildConfigField "String", 'BASE_URL', "${properties.getProperty('api.baseurl', '')}"
-            } else {
-                throw new GradleException("BASE_URL is not set in local.properties")
-            }
         }
     }
     compileOptions {