From d77d9f0c5ca5a74a6b55f7a0315ba761992d17fe Mon Sep 17 00:00:00 2001 From: vrexpert Date: Wed, 19 Jun 2024 17:19:28 +0900 Subject: [PATCH 1/2] feat: update agp version --- android/festago/build.gradle.kts | 2 +- android/festago/common/build.gradle.kts | 4 ++++ android/festago/data-legacy/build.gradle.kts | 6 +++++- android/festago/data/build.gradle.kts | 6 +++++- android/festago/gradle.properties | 1 - android/festago/gradle/wrapper/gradle-wrapper.properties | 4 ++-- android/festago/presentation-legacy/build.gradle.kts | 6 +++++- android/festago/presentation/build.gradle.kts | 6 +++++- 8 files changed, 27 insertions(+), 8 deletions(-) diff --git a/android/festago/build.gradle.kts b/android/festago/build.gradle.kts index a39bf1aab..53a7c5b74 100644 --- a/android/festago/build.gradle.kts +++ b/android/festago/build.gradle.kts @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - val agpVersion = "8.0.2" + val agpVersion = "8.4.0" id("com.android.application") version agpVersion apply false id("com.android.library") version agpVersion apply false diff --git a/android/festago/common/build.gradle.kts b/android/festago/common/build.gradle.kts index 9fd20d703..6bac17506 100644 --- a/android/festago/common/build.gradle.kts +++ b/android/festago/common/build.gradle.kts @@ -8,6 +8,10 @@ android { namespace = "com.festago.festago.common" compileSdk = 34 + buildFeatures { + buildConfig = true + } + defaultConfig { minSdk = 26 consumerProguardFiles("consumer-rules.pro") diff --git a/android/festago/data-legacy/build.gradle.kts b/android/festago/data-legacy/build.gradle.kts index a40a9a331..196365e0a 100644 --- a/android/festago/data-legacy/build.gradle.kts +++ b/android/festago/data-legacy/build.gradle.kts @@ -12,6 +12,10 @@ android { namespace = "com.festago.festago.data" compileSdk = 34 + buildFeatures { + buildConfig = true + } + defaultConfig { minSdk = 28 @@ -86,5 +90,5 @@ dependencies { } fun getSecretKey(propertyKey: String): String { - return gradleLocalProperties(rootDir).getProperty(propertyKey) + return gradleLocalProperties(rootDir, providers).getProperty(propertyKey) } diff --git a/android/festago/data/build.gradle.kts b/android/festago/data/build.gradle.kts index 065a0b329..e6d4e90af 100644 --- a/android/festago/data/build.gradle.kts +++ b/android/festago/data/build.gradle.kts @@ -12,6 +12,10 @@ android { namespace = "com.festago.festago.data" compileSdk = 34 + buildFeatures { + buildConfig = true + } + defaultConfig { minSdk = 28 @@ -97,5 +101,5 @@ dependencies { } fun getSecretKey(propertyKey: String): String { - return gradleLocalProperties(rootDir).getProperty(propertyKey) + return gradleLocalProperties(rootDir, providers).getProperty(propertyKey) } diff --git a/android/festago/gradle.properties b/android/festago/gradle.properties index 11a9b2446..2cbd6d19d 100644 --- a/android/festago/gradle.properties +++ b/android/festago/gradle.properties @@ -21,4 +21,3 @@ kotlin.code.style=official # 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.nonTransitiveRClass=true -android.defaults.buildfeatures.buildconfig=true diff --git a/android/festago/gradle/wrapper/gradle-wrapper.properties b/android/festago/gradle/wrapper/gradle-wrapper.properties index dfe5fc850..cbd231ba9 100644 --- a/android/festago/gradle/wrapper/gradle-wrapper.properties +++ b/android/festago/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 06 17:20:35 KST 2023 +#Wed Jun 19 16:55:17 TLT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/android/festago/presentation-legacy/build.gradle.kts b/android/festago/presentation-legacy/build.gradle.kts index 6706372db..4a08f8031 100644 --- a/android/festago/presentation-legacy/build.gradle.kts +++ b/android/festago/presentation-legacy/build.gradle.kts @@ -13,6 +13,10 @@ android { namespace = "com.festago.festago.presentation" compileSdk = 34 + buildFeatures { + buildConfig = true + } + defaultConfig { minSdk = 28 @@ -134,5 +138,5 @@ dependencies { } fun getSecretKey(propertyKey: String): String { - return gradleLocalProperties(rootDir).getProperty(propertyKey) + return gradleLocalProperties(rootDir, providers).getProperty(propertyKey) } diff --git a/android/festago/presentation/build.gradle.kts b/android/festago/presentation/build.gradle.kts index 05e1d77f8..b7a303f75 100644 --- a/android/festago/presentation/build.gradle.kts +++ b/android/festago/presentation/build.gradle.kts @@ -14,6 +14,10 @@ android { namespace = "com.festago.festago.presentation" compileSdk = 34 + buildFeatures { + buildConfig = true + } + defaultConfig { minSdk = 28 @@ -145,5 +149,5 @@ dependencies { } fun getSecretKey(propertyKey: String): String { - return gradleLocalProperties(rootDir).getProperty(propertyKey) + return gradleLocalProperties(rootDir, providers).getProperty(propertyKey) } From 69e74a8e4472be8ddef2b1057835315930c5b0e2 Mon Sep 17 00:00:00 2001 From: vrexpert Date: Mon, 24 Jun 2024 19:09:14 +0900 Subject: [PATCH 2/2] chore: update app version to 2.1.1 --- android/festago/app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/festago/app/build.gradle.kts b/android/festago/app/build.gradle.kts index 9745bdb39..45a9a08a0 100644 --- a/android/festago/app/build.gradle.kts +++ b/android/festago/app/build.gradle.kts @@ -16,8 +16,8 @@ android { applicationId = "com.festago.festago" minSdk = 28 targetSdk = 34 - versionCode = 13 - versionName = "2.1.0" + versionCode = 14 + versionName = "2.1.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }