Skip to content

Commit

Permalink
AGP 8.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
syslogic committed Aug 9, 2024
1 parent f2d68ad commit bc67710
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 20 deletions.
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Root project build.gradle
buildscript {
ext {
version_code = 27
version_name = '1.2.7'
version_code = 28
version_name = '1.2.8'
min_sdk = 21
compile_sdk = 34
target_sdk = 34
compile_sdk = 35
target_sdk = 35
}
}

Expand All @@ -15,6 +15,7 @@ plugins {
alias(libs.plugins.androidx.navigation.safeargs) apply false
alias(libs.plugins.kotlin.compose.compiler) apply false
alias(libs.plugins.kotlin.android) apply false
// alias(libs.plugins.devtools.ksp) apply false
alias(libs.plugins.kotlin.kapt) apply false
}

Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ kapt.incremental.apt=false

android.enableJetifier=false
android.useAndroidX=true

android.suppressUnsupportedCompileSdk=35
21 changes: 11 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
[versions]
android_gradle_plugin = '8.3.2'
android_gradle_plugin = '8.5.2'
material_design = '1.12.0'
junit = '4.13.2'
kotlin = '2.0.0'
kotlin_compiler_extension = '1.5.11'
androidx_compose_bom = '2024.05.00'
androidx_compose_uitest = '1.6.7'
# devtools_ksp = "2.0.0-1.0.23"
androidx_compose_bom = '2024.06.00'
androidx_compose_uitest = '1.6.8'
androidx_core = '1.13.1'
androidx_appcompat = '1.7.0'
androidx_navigation = '2.7.7'
androidx_preference = '1.2.1'
androidx_test_junit = '1.1.5'
androidx_test_core = '1.5.0'
androidx_test_rules = '1.5.0'
androidx_test_runner = '1.5.2'
androidx_test_monitor = '1.6.1'
androidx_test_espresso = '3.5.1'
androidx_test_junit = '1.2.1'
androidx_test_core = '1.6.1'
androidx_test_rules = '1.6.1'
androidx_test_runner = '1.6.1'
androidx_test_monitor = '1.7.1'
androidx_test_espresso = '3.6.1'
androidx_test_uiautomator = '2.3.0'

[plugins]
android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }
android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }
androidx_navigation_safeargs = { id = "androidx.navigation.safeargs", version.ref = "androidx_navigation" }
# devtools_ksp = { id = "com.google.devtools.ksp", version.ref = "devtools_ksp" }
kotlin_compose_compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin_kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
5 changes: 3 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// Module :library
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose.compiler)
// alias(libs.plugins.devtools.ksp)
alias(libs.plugins.kotlin.kapt)
id 'maven-publish'
}

Expand All @@ -13,7 +14,7 @@ base {

android {
namespace 'io.syslogic.colorpicker'
buildToolsVersion = '34.0.0'
buildToolsVersion = '35.0.0'
compileSdk compile_sdk
defaultConfig {
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
Expand Down
7 changes: 4 additions & 3 deletions mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.androidx.navigation.safeargs)
alias(libs.plugins.kotlin.kapt)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose.compiler)
alias(libs.plugins.kotlin.android)
// alias(libs.plugins.devtools.ksp)
alias(libs.plugins.kotlin.kapt)
}

base {
Expand All @@ -13,7 +14,7 @@ base {

android {
namespace "io.syslogic.demo.colorpicker"
buildToolsVersion = '34.0.0'
buildToolsVersion = '35.0.0'
compileSdk compile_sdk
defaultConfig {
applicationId "io.syslogic.demo.colorpicker"
Expand Down

0 comments on commit bc67710

Please sign in to comment.