diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml new file mode 100644 index 0000000..dbd2d67 --- /dev/null +++ b/.github/workflows/dev_deploy.yml @@ -0,0 +1,58 @@ +name: Dev CI/CD + +on: + push: + branches: + - release + pull_request: + +jobs: + build: + name: 개발 배포 + runs-on: ubuntu-latest + + env: + KEYSTORE_PATH: imdang_key_store.jks + KEY_PROPERTIES_PATH: key.properties + LOCAL_PROPERTIES_PATH: local.properties + + steps: + # GitHub 저장소 클론 + - name: Checkout code + uses: actions/checkout@v3 + + # JDK 설정 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0' + + # Ktlint 실행 + - name: Run ktlint + run: ./gradlew ktlintCheck + + # Fastlane 설치 + - name: Install fastlane + run: gem install fastlane + + # GitHub secrets에 저장된 release keystore decoding + - name: Decode release keystore + run: echo "${{ secrets.RELEASE_KEYSTORE }}" | base64 --decode > ${{ env.KEYSTORE_PATH }} + + # GitHub secrets에 저장된 key.properties decoding + - name: Decode key properties + run: echo "${{ secrets.RELEASE_KEY_PROPERTIES }}" | base64 --decode > ${{ env.KEY_PROPERTIES_PATH }} + + # Github secrets에 저장된 local.properties decoding + - name: Decode local properties + run: echo "${{ secrets.LOCAL_PROPERTIES }}" | base64 --decode > ${{ env.LOCAL_PROPERTIES_PATH }} + + # Fastlane 실행 + - name: Run Fastlane + run: fastlane android dev diff --git a/.github/workflows/prod_deploy.yml b/.github/workflows/prod_deploy.yml new file mode 100644 index 0000000..a8863af --- /dev/null +++ b/.github/workflows/prod_deploy.yml @@ -0,0 +1,58 @@ +name: Product CI/CD + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + name: 운영 배포 + runs-on: ubuntu-latest + + env: + KEYSTORE_PATH: imdang_key_store.jks + KEY_PROPERTIES_PATH: key.properties + LOCAL_PROPERTIES_PATH: local.properties + + steps: + # GitHub 저장소 클론 + - name: Checkout code + uses: actions/checkout@v3 + + # JDK 설정 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0' + + # Ktlint 실행 + - name: Run ktlint + run: ./gradlew ktlintCheck + + # Fastlane 설치 + - name: Install fastlane + run: gem install fastlane + + # GitHub secrets에 저장된 release keystore decoding + - name: Decode release keystore + run: echo "${{ secrets.RELEASE_KEYSTORE }}" | base64 --decode > ${{ env.KEYSTORE_PATH }} + + # GitHub secrets에 저장된 key.properties decoding + - name: Decode key properties + run: echo "${{ secrets.RELEASE_KEY_PROPERTIES }}" | base64 --decode > ${{ env.KEY_PROPERTIES_PATH }} + + # Github secrets에 저장된 local.properties decoding + - name: Decode local properties + run: echo "${{ secrets.LOCAL_PROPERTIES }}" | base64 --decode > ${{ env.LOCAL_PROPERTIES_PATH }} + + # Fastlane 실행 + - name: Run Fastlane + run: fastlane android product diff --git a/.gitignore b/.gitignore index 8a09e34..bd0960f 100644 --- a/.gitignore +++ b/.gitignore @@ -213,3 +213,10 @@ fabric.properties !/gradle/wrapper/gradle-wrapper.jar # End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,kotlin,java,firebase + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/README.md diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..cdd3a6b --- /dev/null +++ b/Gemfile @@ -0,0 +1,6 @@ +source "https://rubygems.org" + +gem "fastlane" + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..7cc8093 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,230 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.1011.0) + aws-sdk-core (3.213.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.96.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.172.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.225.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-firebase_app_distribution (0.9.1) + google-apis-firebaseappdistribution_v1 (~> 0.3.0) + google-apis-firebaseappdistribution_v1alpha (~> 0.2.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-firebaseappdistribution_v1 (0.3.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-firebaseappdistribution_v1alpha (0.2.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.7) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.8.2) + jwt (2.9.3) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + nanaimo (0.4.0) + naturally (2.2.1) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.1) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.3.9) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.0) + xcodeproj (1.27.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + arm64-darwin-23 + ruby + +DEPENDENCIES + fastlane + fastlane-plugin-firebase_app_distribution + +BUNDLED WITH + 2.5.23 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1acf147..eeef01d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -48,7 +48,7 @@ android { isShrinkResources = false } release { - isDebuggable = true + isDebuggable = false isMinifyEnabled = true isShrinkResources = true signingConfig = signingConfigs.getByName("release") @@ -94,7 +94,7 @@ android { buildConfigField( "String", "NAVER_CLIENT_ID", - "\"${ProductConfig.NAVER_CLIENT_ID}\"" + "\"${DevConfig.NAVER_CLIENT_ID}\"" ) } create("product") { diff --git a/app/src/main/java/info/imdang/imdang/ui/login/LoginActivity.kt b/app/src/main/java/info/imdang/imdang/ui/login/LoginActivity.kt index f4451db..a55a827 100644 --- a/app/src/main/java/info/imdang/imdang/ui/login/LoginActivity.kt +++ b/app/src/main/java/info/imdang/imdang/ui/login/LoginActivity.kt @@ -58,6 +58,8 @@ class LoginActivity : BaseActivity(R.layout.activity_login } ) } + } else { + Toast.makeText(this, "구글 로그인에 실패 했습니다.", Toast.LENGTH_SHORT).show() } } diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index ecbd489..f895535 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + plugins { id("java-library") id("kotlin") @@ -16,3 +18,9 @@ dependencies { // coroutines implementation(libs.coroutines) } + +tasks.withType { + kotlinOptions { + jvmTarget = "17" + } +} diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 0000000..b6ce7ad --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one +package_name("info.imdang.imdang") # e.g. com.krausefx.app diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 0000000..a793037 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,22 @@ +default_platform(:android) + +platform :android do + lane :dev do + gradle(task: "clean assembleDevRelease") + firebase_app_distribution( + app: "1:999413225080:android:71742a3e44bd870c847f8d", + groups: "imdang", + apk_path: "./app/build/outputs/apk/dev/release/app-dev-release.apk", + firebase_cli_token: "1//0eVgpMDExQljACgYIARAAGA4SNwF-L9Ir2MlQ9OJk8QrUTneVqHRn0-DCTi1mTS2cfKQiPEr3zrWuSfCCSi2OeXPxAecJIrq0lkI" + ) + end + lane :product do + gradle(task: "clean assembleProductRelease") + firebase_app_distribution( + app: "1:838985514590:android:8d6e9c33e19998b10f7ecf", + groups: "imdang", + apk_path: "./app/build/outputs/apk/product/release/app-product-release.apk", + firebase_cli_token: "1//0eVgpMDExQljACgYIARAAGA4SNwF-L9Ir2MlQ9OJk8QrUTneVqHRn0-DCTi1mTS2cfKQiPEr3zrWuSfCCSi2OeXPxAecJIrq0lkI" + ) + end +end diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile new file mode 100644 index 0000000..b18539b --- /dev/null +++ b/fastlane/Pluginfile @@ -0,0 +1,5 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + +gem 'fastlane-plugin-firebase_app_distribution' diff --git a/remote/build.gradle.kts b/remote/build.gradle.kts index ce2e128..fe4c8a8 100644 --- a/remote/build.gradle.kts +++ b/remote/build.gradle.kts @@ -76,7 +76,7 @@ android { buildConfigField( "String", "GOOGLE_WEB_CLIENT_ID", - "\"${DevConfig.GOOGLE_WEB_CLIENT_ID}\"" + "\"${ProductConfig.GOOGLE_WEB_CLIENT_ID}\"" ) buildConfigField( "String",