Skip to content

Commit 9fc0dde

Browse files
authored
Merge pull request #13 from skydoves/compose-bom/09.02
Bump Compose bom to 09.02 and AGP to 8.1.2
2 parents 305f57e + 69d58e5 commit 9fc0dde

File tree

2 files changed

+40
-20
lines changed

2 files changed

+40
-20
lines changed

gradle.properties

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,48 @@
1-
# Project-wide Gradle settings.
2-
# IDE (e.g. Android Studio) users:
3-
# Gradle settings configured through the IDE *will override*
4-
# any settings specified in this file.
5-
# For more details on how to configure your build environment visit
6-
# http://www.gradle.org/docs/current/userguide/build_environment.html
7-
# Specifies the JVM arguments used for the daemon process.
8-
# The setting is particularly useful for tweaking memory settings.
9-
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1+
#
2+
# Designed and developed by 2023 skydoves (Jaewoong Eum)
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
# https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
18+
org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -Dlint.nullness.ignore-deprecated=true
19+
20+
# https://docs.gradle.org/current/userguide/build_cache.html
21+
org.gradle.caching=true
22+
1023
# When configured, Gradle will run in incubating parallel mode.
1124
# This option should only be used with decoupled projects. More details, visit
1225
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
13-
# org.gradle.parallel=true
14-
# AndroidX package structure to make it clearer which packages are bundled with the
15-
# Android operating system, and which are packaged with your app's APK
16-
# https://developer.android.com/topic/libraries/support-library/androidx-rn
26+
org.gradle.parallel=true
27+
28+
# Configure only necessary projects, useful with multimodule projects
29+
org.gradle.configureondemand=true
30+
31+
# AndroidX Migration https://developer.android.com/jetpack/androidx/migrate
1732
android.useAndroidX=true
18-
# Kotlin code style for this project: "official" or "obsolete":
19-
kotlin.code.style=official
33+
34+
# Removes uneccessary default build features
35+
android.defaults.buildfeatures.aidl=false
36+
android.defaults.buildfeatures.buildconfig=false
37+
android.defaults.buildfeatures.renderscript=false
38+
android.defaults.buildfeatures.resvalues=false
39+
android.defaults.buildfeatures.shaders=false
40+
2041
# Enables namespacing of each library's R class so that its R class includes only the
2142
# resources declared in the library itself and none from the library's dependencies,
2243
# thereby reducing the size of the R class for that library
44+
# https://developer.android.com/studio/releases/gradle-plugin#4.1-nontransitive-r-class
2345
android.nonTransitiveRClass=true
24-
android.suppressUnsupportedCompileSdk=34
2546

2647
# Required to publish to Nexus (see https://github.com/gradle/gradle/issues/11308)
2748
systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/libs.versions.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[versions]
2-
agp = "8.1.1"
2+
agp = "8.1.2"
33
dokka = "1.9.0"
44
nexusPlugin = "0.25.3"
55
kotlin = "1.9.10"
66
kotlinBinaryCompatibility = "0.13.2"
77
kotlinSerialization = "1.6.0"
88
jvmTarget = "11"
9-
androidxComposeBom = "2023.09.00"
9+
androidxComposeBom = "2023.09.02"
1010
androidxComposeCompiler = "1.5.3"
1111
androidxComposeConstraintLayout = "1.0.1"
1212
androidxActivity = "1.7.2"
@@ -15,7 +15,6 @@ androidxDataStore = "1.0.0"
1515
coroutines = "1.7.3"
1616
accompanist = "0.31.6-rc"
1717
baselineProfiles = "1.3.1"
18-
macroBenchmark = "1.2.0-beta05"
1918
uiAutomator = "2.3.0-alpha04"
2019
spotless = "6.21.0"
2120
junit = "1.1.5"
@@ -54,7 +53,7 @@ accompanist-system-ui = { group = "com.google.accompanist", name = "accompanist-
5453
# unit test
5554
androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTest" }
5655
androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version.ref = "baselineProfiles" }
57-
androidx-benchmark-macro = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "macroBenchmark" }
56+
androidx-benchmark-macro = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }
5857
androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiAutomator" }
5958
junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
6059
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }

0 commit comments

Comments
 (0)