From cedbc17e2a6c419b4878c119d1b0ec82d73fbd20 Mon Sep 17 00:00:00 2001 From: KwonDae Date: Tue, 14 Nov 2023 09:34:03 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC?= =?UTF-8?q?=EB=A6=AC=20=EB=B2=84=EC=A0=84=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8,=20=ED=83=80=EA=B2=9F=20SDK=2034?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 ++- app/build.gradle.kts | 9 ++++--- app/src/main/AndroidManifest.xml | 27 +++++++++---------- .../java/com/yapp/growth/PlanzApplication.kt | 1 + .../main/java/com/yapp/growth/di/AppModule.kt | 2 +- buildSrc/src/main/java/Configs.kt | 8 +++--- buildSrc/src/main/java/Versions.kt | 18 ++++++------- data/build.gradle.kts | 8 ++++-- domain/build.gradle.kts | 4 +-- gradle.properties | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- presentation/build.gradle.kts | 8 +++--- 12 files changed, 49 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 849f7f6..61f4947 100644 --- a/.gitignore +++ b/.gitignore @@ -192,4 +192,6 @@ fabric.properties !/gradle/wrapper/gradle-wrapper.jar -# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos \ No newline at end of file +# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio,macos +*.txt +planz_key_store diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7be4eef..19e71b8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,6 +11,7 @@ plugins { } android { + namespace = "com.yapp.growth.app" compileSdk = Configs.COMPILE_SDK defaultConfig { @@ -47,13 +48,13 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = JavaVersion.VERSION_17.toString() } - packagingOptions { + packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc89bcf..f71706b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,11 +1,10 @@ - + @@ -28,16 +27,14 @@ - + + - + + - + + @@ -57,19 +54,19 @@ diff --git a/app/src/main/java/com/yapp/growth/PlanzApplication.kt b/app/src/main/java/com/yapp/growth/PlanzApplication.kt index 827e459..868d2ab 100644 --- a/app/src/main/java/com/yapp/growth/PlanzApplication.kt +++ b/app/src/main/java/com/yapp/growth/PlanzApplication.kt @@ -2,6 +2,7 @@ package com.yapp.growth import android.app.Application import com.kakao.sdk.common.KakaoSdk +import com.yapp.growth.app.BuildConfig import dagger.hilt.android.HiltAndroidApp import timber.log.Timber diff --git a/app/src/main/java/com/yapp/growth/di/AppModule.kt b/app/src/main/java/com/yapp/growth/di/AppModule.kt index 6f6deaf..8e5a2d6 100644 --- a/app/src/main/java/com/yapp/growth/di/AppModule.kt +++ b/app/src/main/java/com/yapp/growth/di/AppModule.kt @@ -1,7 +1,7 @@ package com.yapp.growth.di -import com.yapp.growth.BuildConfig import com.yapp.growth.LoginSdk +import com.yapp.growth.app.BuildConfig import com.yapp.growth.data.api.NetworkSettings import dagger.Module import dagger.Provides diff --git a/buildSrc/src/main/java/Configs.kt b/buildSrc/src/main/java/Configs.kt index 0a396d8..f727b66 100644 --- a/buildSrc/src/main/java/Configs.kt +++ b/buildSrc/src/main/java/Configs.kt @@ -1,13 +1,13 @@ object Configs { //Android Config - const val COMPILE_SDK = 32 + const val COMPILE_SDK = 34 //Android Default Config const val APPLICATION_ID = "com.yapp.growth" const val MIN_SDK = 26 - const val TARGET_SDK = 32 - const val VERSION_CODE = 220805001 - const val VERSION_NAME = "1.1.1" + const val TARGET_SDK = 34 + const val VERSION_CODE = 231114001 + const val VERSION_NAME = "1.2.0" // App Info const val APP_NAME = "플랜즈" diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index a9fbf37..064623b 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -3,26 +3,26 @@ object Versions { const val ACCOMPANIST_PAGER = "0.24.12-rc" const val ACCOMPANIST_SYSTEM_UI_CONTROLLER = "0.24.12-rc" const val ANDROID_APP_COMPAT = "1.4.1" - const val ANDROID_GRADLE_PLUGIN = "7.3.1" + const val ANDROID_GRADLE_PLUGIN = "8.1.2" const val ANDROID_CORE = "1.7.0" - const val COIL = "1.4.0" - const val COMPOSE = "1.2.0" - const val COMPOSE_ACTIVITY = "1.4.0" + const val COIL = "2.4.0" + const val COMPOSE = "1.5.4" + const val COMPOSE_ACTIVITY = "1.8.0" const val COMPOSE_CONSTRAINT_LAYOUT = "1.1.0-alpha02" const val CONSTRAINT_LAYOUT = "2.1.3" - const val COMPOSE_NAVIGATION = "2.5.0" + const val COMPOSE_NAVIGATION = "2.7.5" const val FIREBASE_BOM = "30.3.1" const val FIREBASE_CRASHLYTICS = "2.9.1" const val GOOGLE_SERVICE = "4.3.14" - const val HILT = "2.42" - const val HILT_ANDROID = "1.0.0-beta01" + const val HILT = "2.48.1" + const val HILT_ANDROID = "1.1.0" const val JUNIT = "4.13.2" const val KAKAO_SDK = "2.11.0" - const val KOTLIN = "1.7.0" + const val KOTLIN = "1.9.20" const val KOTLIN_COROUTINES = "1.6.4" const val KOTLIN_DATETIMES = "0.4.0" const val MATERIAL_CALENDAR = "1.4.3" - const val LIFECYCLE = "2.4.1" + const val LIFECYCLE = "2.6.2" const val OKHTTP = "4.3.1" const val RETROFIT = "2.7.1" const val SECRETS_GRADLE = "2.0.1" diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 9a327ed..0535e4a 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -9,13 +9,17 @@ plugins { } android { + namespace = "com.yapp.growth.data" compileSdk = Configs.COMPILE_SDK defaultConfig { minSdk = Configs.MIN_SDK - targetSdk = Configs.TARGET_SDK + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = JavaVersion.VERSION_17.toString() } } diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index 16cd2d3..1b9d649 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -7,8 +7,8 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } dependencies { diff --git a/gradle.properties b/gradle.properties index aa5fda3..9f275cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,3 +22,4 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 734f629..bd32dd9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon May 16 22:48:54 KST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 9fafe03..c981f7d 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -12,21 +12,21 @@ plugins { } android { + namespace = "com.yapp.growth.presentation" compileSdk = Configs.COMPILE_SDK defaultConfig { minSdk = Configs.MIN_SDK - targetSdk = Configs.TARGET_SDK vectorDrawables { useSupportLibrary = true } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = JavaVersion.VERSION_17.toString() } buildFeatures { compose = true From 06d72872ec5e79bdbb67ee32fe77a5909ba99813 Mon Sep 17 00:00:00 2001 From: Daewon Kwon <33443660+KwonDae@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:38:50 +0900 Subject: [PATCH 2/2] Update android.yml --- .github/workflows/android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 7e6411d..4b39712 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -11,10 +11,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle