Skip to content

Commit 2260c4c

Browse files
committed
update to Kotlin 1.7.0
1 parent 263e699 commit 2260c4c

File tree

2 files changed

+30
-9
lines changed

2 files changed

+30
-9
lines changed

app/build.gradle

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,43 @@ android {
5757
compose true
5858
}
5959
composeOptions {
60-
kotlinCompilerExtensionVersion "1.1.1"
60+
kotlinCompilerExtensionVersion "1.2.0"
61+
}
62+
}
63+
64+
subprojects {
65+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
66+
kotlinOptions {
67+
if (project.findProperty("composeCompilerReports") == "true") {
68+
freeCompilerArgs += [
69+
"-P",
70+
"plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
71+
project.buildDir.absolutePath + "/compose_compiler"
72+
]
73+
}
74+
if (project.findProperty("composeCompilerMetrics") == "true") {
75+
freeCompilerArgs += [
76+
"-P",
77+
"plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
78+
project.buildDir.absolutePath + "/compose_compiler"
79+
]
80+
}
81+
}
6182
}
6283
}
6384

6485
dependencies {
6586
def compose_version = "1.1.1"
6687

6788
implementation fileTree(dir: 'libs', include: ['*.jar'])
68-
implementation "androidx.appcompat:appcompat:1.4.1"
69-
implementation "androidx.core:core-ktx:1.7.0"
70-
implementation 'com.google.android.material:material:1.5.0'
89+
implementation "androidx.appcompat:appcompat:1.4.2"
90+
implementation "androidx.core:core-ktx:1.8.0"
91+
implementation 'com.google.android.material:material:1.6.1'
7192
implementation "androidx.compose.ui:ui:$compose_version"
7293
implementation "androidx.compose.material:material:$compose_version"
7394
implementation "androidx.compose.ui:ui-tooling:$compose_version"
74-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
75-
implementation "androidx.activity:activity-compose:1.4.0"
95+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0'
96+
implementation "androidx.activity:activity-compose:1.5.0"
7697
implementation "androidx.compose.animation:animation-core:$compose_version"
7798
implementation "androidx.compose.animation:animation:$compose_version"
7899
implementation("androidx.compose.ui:ui:$compose_version")
@@ -91,7 +112,7 @@ dependencies {
91112
implementation "androidx.compose.ui:ui-tooling:$compose_version"
92113

93114
//Compose Constraintlayout
94-
implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.0'
115+
implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1'
95116

96117
testImplementation "junit:junit:4.13.2"
97118
androidTestImplementation "androidx.test:runner:1.4.0"
@@ -102,7 +123,7 @@ dependencies {
102123
androidTestImplementation("androidx.test:core:1.4.0")
103124
androidTestImplementation("androidx.test.ext:junit:1.1.3")
104125
androidTestImplementation("androidx.test:rules:1.4.0")
105-
androidTestImplementation("org.mockito:mockito-core:4.3.1")
126+
androidTestImplementation("org.mockito:mockito-core:4.6.1")
106127
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_version")
107128
androidTestImplementation("androidx.compose.ui:ui-test:$compose_version")
108129
androidTestImplementation("androidx.test.ext:junit:1.1.3")

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
buildscript {
55
ext {
66
compose_version = '1.1.1'
7-
kotlin_version = "1.6.10"
7+
kotlin_version = "1.7.0"
88
}
99
repositories {
1010
google()

0 commit comments

Comments
 (0)