From dffdf236dfd883438ae6ecaa3871f6b562692d3d Mon Sep 17 00:00:00 2001 From: GunHyung Ham Date: Tue, 20 Feb 2024 23:37:04 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[feat]=20:=20=ED=82=A4=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EC=96=B4=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 54efdc68..3e329212 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,6 @@ +import org.jetbrains.kotlin.konan.properties.Properties +import java.io.FileInputStream + plugins { alias(libs.plugins.funch.application) alias(libs.plugins.funch.compose) @@ -19,6 +22,18 @@ android { versionName = libs.versions.appVersion.get() } + signingConfigs { + create("release") { + Properties().apply { + load(FileInputStream(rootProject.file("local.properties"))) + storeFile = rootProject.file(this["STORE_FILE"] as String) + keyAlias = this["KEY_ALIAS"] as String + keyPassword = this["KEY_PASSWORD"] as String + storePassword = this["STORE_PASSWORD"] as String + } + } + } + buildTypes { release { isMinifyEnabled = false @@ -26,6 +41,7 @@ android { getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" ) + signingConfig = signingConfigs.getByName("release") } } } From 034aa221b916a70b06cc391c53924411f2cc5393 Mon Sep 17 00:00:00 2001 From: GunHyung Ham Date: Tue, 20 Feb 2024 23:55:22 +0900 Subject: [PATCH 2/6] [chore] : reformat --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3e329212..e691c560 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,5 @@ -import org.jetbrains.kotlin.konan.properties.Properties import java.io.FileInputStream +import org.jetbrains.kotlin.konan.properties.Properties plugins { alias(libs.plugins.funch.application) From f2dbe88e2cf043b7ea31778c92a91d777471153e Mon Sep 17 00:00:00 2001 From: murjune Date: Wed, 21 Feb 2024 00:04:24 +0900 Subject: [PATCH 3/6] build : PR_BUILDER $STORE_PASSWORD --- .github/workflows/PR_Builder.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/PR_Builder.yml b/.github/workflows/PR_Builder.yml index b84c851b..d675e37b 100644 --- a/.github/workflows/PR_Builder.yml +++ b/.github/workflows/PR_Builder.yml @@ -46,20 +46,28 @@ jobs: # KAKAO_NATIVE_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }} # KAKAO_REDIRECT_SCHEME: ${{ secrets.KAKAO_REDIRECT_SCHEME }} # KEYSTORE_PATH: ${{ secrets.KEYSTORE_PATH }} -# STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} -# KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} -# KEY_ALIAS: ${{ secrets.KEY_ALIAS }} -# STORE_FILE: ${{ secrets.STORE_FILE }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + STORE_FILE: ${{ secrets.STORE_FILE }} run: | echo FUNCH_DEBUG_BASE_URL=\"FUNCH_DEBUG_BASE_URL\" >> local.properties # echo HOST_RELEASE_URI=\"$HOST_RELEASE_URI\" >> local.properties # echo KAKAO_NATIVE_APP_KEY=\"$KAKAO_NATIVE_APP_KEY\" >> local.properties # echo KAKAO_REDIRECT_SCHEME=\"$KAKAO_REDIRECT_SCHEME\" >> local.properties # echo KEYSTORE_PATH= $KEYSTORE_PATH >> local.properties -# echo STORE_PASSWORD= $STORE_PASSWORD >> local.properties -# echo KEY_PASSWORD= $KEY_PASSWORD >> local.properties -# echo KEY_ALIAS= $KEY_ALIAS >> local.properties -# echo STORE_FILE= $STORE_FILE >> local.properties + echo STORE_PASSWORD= $STORE_PASSWORD >> local.properties + echo KEY_PASSWORD= $KEY_PASSWORD >> local.properties + echo KEY_ALIAS= $KEY_ALIAS >> local.properties + echo STORE_FILE= $STORE_FILE >> local.properties + + - name: Create keystore + run: | + mkdir -p app/keystore + touch app/keystore/hous_key.jks + + - name: decode release keystore + run: echo "${{ secrets.STORE_FILE }}" | base64 -d > keystore/funch_key_store.jks - name: Grant execute permission for gradlew run: chmod +x gradlew From 94b697566e8de1e33968590eeb8a29937f3dd2dc Mon Sep 17 00:00:00 2001 From: murjune Date: Wed, 21 Feb 2024 00:29:35 +0900 Subject: [PATCH 4/6] =?UTF-8?q?build=20:=20master=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Builder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PR_Builder.yml b/.github/workflows/PR_Builder.yml index d675e37b..f389e7bc 100644 --- a/.github/workflows/PR_Builder.yml +++ b/.github/workflows/PR_Builder.yml @@ -2,7 +2,7 @@ name: Hous PR Builder on: pull_request: - branches: [ develop, main ] + branches: [ develop, master ] jobs: build: From 4526299d6771a914de837681549956d540638a6e Mon Sep 17 00:00:00 2001 From: murjune Date: Wed, 21 Feb 2024 00:31:46 +0900 Subject: [PATCH 5/6] =?UTF-8?q?build=20:=20=ED=8C=8C=EC=9D=BC=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Builder.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/PR_Builder.yml b/.github/workflows/PR_Builder.yml index f389e7bc..3ed855fa 100644 --- a/.github/workflows/PR_Builder.yml +++ b/.github/workflows/PR_Builder.yml @@ -42,33 +42,17 @@ jobs: - name: Access Local Properties env: FUNCH_DEBUG_BASE_URL: ${{ secrets.FUNCH_DEBUG_BASE_URL }} -# HOST_RELEASE_URI: ${{ secrets.HOST_RELEASE_URI }} -# KAKAO_NATIVE_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }} -# KAKAO_REDIRECT_SCHEME: ${{ secrets.KAKAO_REDIRECT_SCHEME }} -# KEYSTORE_PATH: ${{ secrets.KEYSTORE_PATH }} STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} KEY_ALIAS: ${{ secrets.KEY_ALIAS }} STORE_FILE: ${{ secrets.STORE_FILE }} run: | echo FUNCH_DEBUG_BASE_URL=\"FUNCH_DEBUG_BASE_URL\" >> local.properties -# echo HOST_RELEASE_URI=\"$HOST_RELEASE_URI\" >> local.properties -# echo KAKAO_NATIVE_APP_KEY=\"$KAKAO_NATIVE_APP_KEY\" >> local.properties -# echo KAKAO_REDIRECT_SCHEME=\"$KAKAO_REDIRECT_SCHEME\" >> local.properties -# echo KEYSTORE_PATH= $KEYSTORE_PATH >> local.properties echo STORE_PASSWORD= $STORE_PASSWORD >> local.properties echo KEY_PASSWORD= $KEY_PASSWORD >> local.properties echo KEY_ALIAS= $KEY_ALIAS >> local.properties echo STORE_FILE= $STORE_FILE >> local.properties - - name: Create keystore - run: | - mkdir -p app/keystore - touch app/keystore/hous_key.jks - - - name: decode release keystore - run: echo "${{ secrets.STORE_FILE }}" | base64 -d > keystore/funch_key_store.jks - - name: Grant execute permission for gradlew run: chmod +x gradlew From 733ed01db68de9ddb58cf2b40c24e40dddea70d6 Mon Sep 17 00:00:00 2001 From: GunHyung Ham Date: Wed, 21 Feb 2024 02:12:21 +0900 Subject: [PATCH 6/6] =?UTF-8?q?[CI]=20:=20=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=ED=82=A4=EC=8A=A4=ED=86=A0=EC=96=B4=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Builder.yml | 98 +++++++++++++++++--------------- 1 file changed, 52 insertions(+), 46 deletions(-) diff --git a/.github/workflows/PR_Builder.yml b/.github/workflows/PR_Builder.yml index 3ed855fa..834a6091 100644 --- a/.github/workflows/PR_Builder.yml +++ b/.github/workflows/PR_Builder.yml @@ -10,57 +10,63 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - - name: Gradle cache - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} - restore-keys: | - ${{ runner.os }}-gradle- + - name: Gradle cache + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }} + restore-keys: | + ${{ runner.os }}-gradle- - - name: set up JDK 17 - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 17 + - name: set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: 17 -# - name: Create Google-Services.json -# env: -# GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }} -# run: | -# touch ./app/google-services.json -# echo $GOOGLE_SERVICES >> ./app/google-services.json -# cat ./app/google-services.json -# - - name: Create Local Properties - run: touch local.properties + # - name: Create Google-Services.json + # env: + # GOOGLE_SERVICES: ${{ secrets.GOOGLE_SERVICES }} + # run: | + # touch ./app/google-services.json + # echo $GOOGLE_SERVICES >> ./app/google-services.json + # cat ./app/google-services.json + # + - name: Create Local Properties + run: touch local.properties - - name: Access Local Properties - env: - FUNCH_DEBUG_BASE_URL: ${{ secrets.FUNCH_DEBUG_BASE_URL }} - STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} - KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} - KEY_ALIAS: ${{ secrets.KEY_ALIAS }} - STORE_FILE: ${{ secrets.STORE_FILE }} - run: | - echo FUNCH_DEBUG_BASE_URL=\"FUNCH_DEBUG_BASE_URL\" >> local.properties - echo STORE_PASSWORD= $STORE_PASSWORD >> local.properties - echo KEY_PASSWORD= $KEY_PASSWORD >> local.properties - echo KEY_ALIAS= $KEY_ALIAS >> local.properties - echo STORE_FILE= $STORE_FILE >> local.properties + - name: Access Local Properties + env: + FUNCH_DEBUG_BASE_URL: ${{ secrets.FUNCH_DEBUG_BASE_URL }} + STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }} + KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} + KEY_ALIAS: ${{ secrets.KEY_ALIAS }} + STORE_FILE: ${{ secrets.STORE_FILE }} + run: | + echo FUNCH_DEBUG_BASE_URL=\"FUNCH_DEBUG_BASE_URL\" >> local.properties + echo STORE_PASSWORD= $STORE_PASSWORD >> local.properties + echo KEY_PASSWORD= $KEY_PASSWORD >> local.properties + echo KEY_ALIAS= $KEY_ALIAS >> local.properties + echo STORE_FILE= $STORE_FILE >> local.properties - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - name: Create Key Store + env: + KEY_STORE_BASE_64: ${{secrets.KEY_STORE_BASE_64}} + run: | + echo "$KEY_STORE_BASE_64" | base64 -d > ./funch_key_store.jks - - name: Lint Check - run: ./gradlew ktlintCheck + - name: Grant execute permission for gradlew + run: chmod +x gradlew - - name: run rest - run: ./gradlew test + - name: Lint Check + run: ./gradlew ktlintCheck - - name: Build with Gradle - run: ./gradlew build + - name: run rest + run: ./gradlew test + + - name: Build with Gradle + run: ./gradlew build