Skip to content

Commit ceac650

Browse files
authored
Merge pull request #113 from joreilly/dependency_upddates
dependency updates
2 parents c44f87d + fe195d2 commit ceac650

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

composeApp/build.gradle.kts

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ plugins {
1313
}
1414

1515
kotlin {
16-
@OptIn(ExperimentalWasmDsl::class)
16+
jvmToolchain(17)
17+
18+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
1719
wasmJs {
1820
moduleName = "composeApp"
1921
browser {

composeApp/src/androidMain/kotlin/dev/johnoreilly/climatetrace/MainActivity.kt

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package dev.johnoreilly.climatetrace
55
import android.os.Bundle
66
import androidx.activity.ComponentActivity
77
import androidx.activity.compose.setContent
8+
import androidx.activity.enableEdgeToEdge
89
import androidx.compose.material3.ExperimentalMaterial3Api
910
import androidx.compose.material3.MaterialTheme
1011
import androidx.compose.runtime.Composable
@@ -15,6 +16,7 @@ import dev.johnoreilly.climatetrace.ui.CountryListScreen
1516
class MainActivity : ComponentActivity() {
1617

1718
override fun onCreate(savedInstanceState: Bundle?) {
19+
enableEdgeToEdge()
1820
super.onCreate(savedInstanceState)
1921

2022
initKoin(this)

gradle/libs.versions.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ ksp = "2.0.20-1.0.25"
44
kotlinx-coroutines = "1.9.0"
55

66

7-
agp = "8.5.2"
7+
agp = "8.7.0"
88
android-compileSdk = "34"
99
android-minSdk = "24"
1010
android-targetSdk = "34"
1111
androidx-activityCompose = "1.9.2"
12-
compose = "1.7.2"
13-
compose-plugin = "1.7.0-beta02"
12+
compose = "1.7.3"
13+
compose-plugin = "1.7.0-rc01"
1414
composeAdaptiveLayout = "1.0.0-alpha01"
1515
harawata-appdirs = "1.2.2"
1616
koalaplot = "0.5.3"

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)