Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AN/USER] feat: update agp version (8.4.0) #1014

Merged
merged 2 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/festago/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion android/festago/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 4 additions & 0 deletions android/festago/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ android {
namespace = "com.festago.festago.common"
compileSdk = 34

buildFeatures {
buildConfig = true
}

defaultConfig {
minSdk = 26
consumerProguardFiles("consumer-rules.pro")
Expand Down
6 changes: 5 additions & 1 deletion android/festago/data-legacy/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ android {
namespace = "com.festago.festago.data"
compileSdk = 34

buildFeatures {
buildConfig = true
}

defaultConfig {
minSdk = 28

Expand Down Expand Up @@ -86,5 +90,5 @@ dependencies {
}

fun getSecretKey(propertyKey: String): String {
return gradleLocalProperties(rootDir).getProperty(propertyKey)
return gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
}
6 changes: 5 additions & 1 deletion android/festago/data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ android {
namespace = "com.festago.festago.data"
compileSdk = 34

buildFeatures {
buildConfig = true
}

defaultConfig {
minSdk = 28

Expand Down Expand Up @@ -97,5 +101,5 @@ dependencies {
}

fun getSecretKey(propertyKey: String): String {
return gradleLocalProperties(rootDir).getProperty(propertyKey)
return gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
}
1 change: 0 additions & 1 deletion android/festago/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions android/festago/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion android/festago/presentation-legacy/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ android {
namespace = "com.festago.festago.presentation"
compileSdk = 34

buildFeatures {
buildConfig = true
}

defaultConfig {
minSdk = 28

Expand Down Expand Up @@ -134,5 +138,5 @@ dependencies {
}

fun getSecretKey(propertyKey: String): String {
return gradleLocalProperties(rootDir).getProperty(propertyKey)
return gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
}
6 changes: 5 additions & 1 deletion android/festago/presentation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ android {
namespace = "com.festago.festago.presentation"
compileSdk = 34

buildFeatures {
buildConfig = true
}

defaultConfig {
minSdk = 28

Expand Down Expand Up @@ -145,5 +149,5 @@ dependencies {
}

fun getSecretKey(propertyKey: String): String {
return gradleLocalProperties(rootDir).getProperty(propertyKey)
return gradleLocalProperties(rootDir, providers).getProperty(propertyKey)
}
Loading