Skip to content

Commit bf63090

Browse files
committed
up targetSdk to 36
1 parent 9c0b69c commit bf63090

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

build-logic/dependencies/src/main/kotlin/AndroidLibraryConventionPlugin.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import AppExt.findPluginId
1+
import AppExt.findVersionInt
22
import AppExt.libs
33
import com.android.build.gradle.LibraryExtension
44
import org.gradle.api.Plugin
@@ -23,7 +23,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
2323
extensions.configure<LibraryExtension> {
2424
configureKotlinAndroid(this)
2525
defaultConfig.apply {
26-
targetSdk = 34
26+
targetSdk = libs.findVersionInt("targetSdk")
2727
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2828
consumerProguardFiles("consumer-rules.pro")
2929
buildTypes {

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9-
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
9+
org.gradle.jvmargs=-Xms4g -Xmx18g -Dfile.encoding\=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx18g -XX:+UseG1GC -XX:MaxGCPauseMillis=400 -Dfile.encoding=UTF-8
10+
kotlin.daemon.jvmargs=-Xms2g -Xmx18g
1011
# When configured, Gradle will run in incubating parallel mode.
1112
# This option should only be used with decoupled projects. More details, visit
1213
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ androidGradlePlugin = "8.8.1"
55
androidTools = "31.8.1"
66

77
minSdk = "28"
8-
targetSdk = "35"
9-
compileSdk = "35"
8+
targetSdk = "36"
9+
compileSdk = "36"
1010
versionName = "1.77"
1111
versionCode = "24"
1212

0 commit comments

Comments
 (0)