Skip to content

Commit 77ff92d

Browse files
popovanton0popovanton0
committed
Kotlin and compose upgrade
1 parent f1c43b0 commit 77ff92d

File tree

10 files changed

+66
-28
lines changed

10 files changed

+66
-28
lines changed

‎.idea/.gitignore‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.idea/compiler.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/icon.png‎

38.8 KB
Loading

‎.idea/inspectionProfiles/Project_Default.xml‎

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'com.android.application'
33
id 'org.jetbrains.kotlin.android'
4+
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21"
45
}
56

67
android {
@@ -35,9 +36,6 @@ android {
3536
buildFeatures {
3637
compose true
3738
}
38-
composeOptions {
39-
kotlinCompilerExtensionVersion compose_compiler_version
40-
}
4139
packagingOptions {
4240
resources {
4341
excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -48,16 +46,16 @@ android {
4846

4947
dependencies {
5048
implementation project(':heart-switch')
51-
implementation 'androidx.core:core-ktx:1.12.0'
49+
implementation 'androidx.core:core-ktx:1.13.1'
5250
implementation "androidx.compose.ui:ui:$compose_version"
5351
implementation "androidx.compose.material:material:$compose_version"
5452
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
55-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
56-
implementation 'androidx.activity:activity-compose:1.8.2'
53+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
54+
implementation 'androidx.activity:activity-compose:1.9.2'
5755
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
5856

5957
testImplementation 'junit:junit:4.13.2'
60-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
61-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
58+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
59+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
6260
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
6361
}

‎build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
buildscript {
22
ext {
3-
compose_version = '1.6.0'
4-
compose_compiler_version = '1.5.8'
3+
compose_version = '1.7.3'
4+
compose_compiler_version = '1.5.14'
55
}
66
}
77

88
plugins {
9-
id 'com.android.application' version '8.2.2' apply false
10-
id 'com.android.library' version '8.2.2' apply false
11-
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
12-
id 'org.jetbrains.kotlinx.binary-compatibility-validator' version '0.13.2' apply false
9+
id 'com.android.application' version '8.6.1' apply false
10+
id 'com.android.library' version '8.6.1' apply false
11+
id 'org.jetbrains.kotlin.android' version '2.0.21' apply false
12+
id 'org.jetbrains.kotlinx.binary-compatibility-validator' version '0.16.3' apply false
1313
}
1414

1515
tasks.register('clean', Delete) {

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Sat Jun 01 17:34:12 MSK 2024
12
distributionBase=GRADLE_USER_HOME
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
33
distributionPath=wrapper/dists
4-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎heart-switch/build.gradle‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id 'com.android.library'
33
id 'org.jetbrains.kotlin.android'
4+
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21"
45
id 'org.jetbrains.kotlinx.binary-compatibility-validator'
56
id 'maven-publish'
67
}
@@ -32,9 +33,6 @@ android {
3233
buildFeatures {
3334
compose true
3435
}
35-
composeOptions {
36-
kotlinCompilerExtensionVersion compose_compiler_version
37-
}
3836
namespace 'com.popovanton0.heartswitch'
3937
}
4038

@@ -45,8 +43,8 @@ dependencies {
4543
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
4644

4745
testImplementation 'junit:junit:4.13.2'
48-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
49-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
46+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
47+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
5048
}
5149

5250
assemble.dependsOn check
@@ -58,7 +56,7 @@ afterEvaluate {
5856
from components.release
5957
groupId = 'com.popovanton0.heartswitch'
6058
artifactId = 'heart-switch'
61-
version = '1.5.0'
59+
version = '1.6.0'
6260
}
6361
}
6462
}

‎jitpack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
jdk:
2-
- openjdk17
2+
- openjdk21

0 commit comments

Comments
 (0)