diff --git a/.github/.gitkeep b/.github/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/.github/workflows/develop_branch.yml b/.github/workflows/develop_branch.yml index 28ba3704..f2dd0631 100644 --- a/.github/workflows/develop_branch.yml +++ b/.github/workflows/develop_branch.yml @@ -14,15 +14,9 @@ jobs: - name: check out repository uses: actions/checkout@v4 - - name: Decode Keystore + - name: Decode Keystore & Generate local.properties env: RELEASE_STORE_BASE_64: ${{ secrets.RELEASE_STORE_BASE_64 }} - run: | - echo $RELEASE_STORE_BASE_64 > encoded_keystore.txt - base64 --decode encoded_keystore.txt > release.jks - - - name: Generate local.properties - env: KAKAO_NATIVE_APP_KEY: ${{ secrets.KAKAO_NATIVE_APP_KEY }} KAKAO_REST_API_KEY: ${{ secrets.KAKAO_REST_API_KEY }} BITNAGIL_DEV_URL: ${{ secrets.BITNAGIL_DEV_URL }} @@ -31,6 +25,11 @@ jobs: RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }} RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }} run: | + # Keystore Decoding + echo $RELEASE_STORE_BASE_64 > encoded_keystore.txt + base64 --decode encoded_keystore.txt > release.jks + + # Generate local.properties echo "kakao.native.app.key=$KAKAO_NATIVE_APP_KEY" >> local.properties echo "kakao.rest.api.key=$KAKAO_REST_API_KEY" >> local.properties echo "bitnagil.dev.url=$BITNAGIL_DEV_URL" >> local.properties @@ -45,13 +44,11 @@ jobs: with: java-version: '17' distribution: 'temurin' - cache: gradle - - name: Run ktlint - run: ./gradlew ktlintCheck - - - name: Run unit tests - run: ./gradlew testDebugUnitTest + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + with: + cache-read-only: ${{ github.ref != 'refs/heads/develop' }} - - name: Build with Gradle - run: ./gradlew assembleDebug + - name: Build and Verify + run: ./gradlew ktlintCheck testDebugUnitTest assembleDebug diff --git a/.gitignore b/.gitignore index 7bbb0574..5459e8ca 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,8 @@ gen-external-apklibs ### Kotlin ### # Compiled class file *.class +.kotlin/ +.kotlin # Log file diff --git a/gradle.properties b/gradle.properties index 132244e5..5f7af421 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,23 +1,9 @@ # Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. For more details, visit -# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Kotlin code style for this project: "official" or "obsolete": +org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8 +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true +kotlin.daemon.jvmargs=-Xmx2g -XX:+UseParallelGC kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library +android.useAndroidX=true android.nonTransitiveRClass=true