Skip to content

Commit ca7f61c

Browse files
update versions
1 parent a0e6db7 commit ca7f61c

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

android_example/build.gradle.kts

+17-15
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ plugins {
33
id("org.jetbrains.kotlin.android")
44
}
55

6+
@Suppress("UnstableApiUsage")
67
android {
7-
compileSdk = 32
8+
compileSdk = 33
89

910
defaultConfig {
1011
applicationId = "com.quickbird.android_example"
1112
minSdk = 21
12-
targetSdk = 32
13+
targetSdk = 33
1314
versionCode = 1
1415
versionName = "1.0"
1516

@@ -38,30 +39,31 @@ android {
3839
compose = true
3940
}
4041
composeOptions {
41-
kotlinCompilerExtensionVersion = "1.2.0"
42+
kotlinCompilerExtensionVersion = "1.4.4"
4243
}
44+
namespace = "com.quickbird.android_example"
4345
}
4446

4547
dependencies {
46-
implementation("androidx.core:core-ktx:1.8.0")
48+
implementation("androidx.core:core-ktx:1.9.0")
4749

48-
implementation("androidx.activity:activity-compose:1.5.0")
50+
implementation("androidx.activity:activity-compose:1.7.0")
4951

50-
implementation("androidx.compose.ui:ui:1.2.0-rc03")
51-
implementation("androidx.compose.ui:ui-tooling-preview:1.2.0-rc03")
52-
implementation("androidx.compose.ui:ui-tooling:1.2.0-rc03")
53-
implementation("androidx.compose.material:material:1.2.0-rc03")
54-
implementation("androidx.compose.material:material-icons-extended:1.2.0-rc03")
55-
implementation("androidx.compose.foundation:foundation:1.2.0-rc03")
52+
implementation("androidx.compose.ui:ui:1.4.0")
53+
implementation("androidx.compose.ui:ui-tooling-preview:1.4.0")
54+
implementation("androidx.compose.ui:ui-tooling:1.4.0")
55+
implementation("androidx.compose.material:material:1.4.0")
56+
implementation("androidx.compose.material:material-icons-extended:1.4.0")
57+
implementation("androidx.compose.foundation:foundation:1.4.0")
5658

57-
implementation("androidx.navigation:navigation-compose:2.5.0")
59+
implementation("androidx.navigation:navigation-compose:2.5.3")
5860
implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
59-
implementation("com.google.android.material:material:1.7.0-alpha02")
60-
implementation("androidx.core:core-splashscreen:1.0.0-rc01")
61+
implementation("com.google.android.material:material:1.8.0")
62+
implementation("androidx.core:core-splashscreen:1.0.0")
6163

6264
testImplementation(project(":snapshot"))
6365
testImplementation("junit:junit:4.13.2")
6466

6567
androidTestImplementation(project(":snapshot"))
66-
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.2.0-rc01")
68+
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.4.0")
6769
}

android_example/src/main/AndroidManifest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.quickbird.android_example">
3+
xmlns:tools="http://schemas.android.com/tools">
54

65
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
76
<uses-permission android:name="android.permission.CAMERA" />

build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ buildscript {
99
mavenCentral()
1010
}
1111
dependencies {
12-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
13-
classpath("com.android.tools.build:gradle:7.2.1")
12+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
13+
classpath("com.android.tools.build:gradle:7.4.2")
1414
}
1515
}
1616

gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
org.gradle.jvmargs=-Xmx4096M
22
android.useAndroidX=true
3+
kotlin.mpp.androidSourceSetLayoutVersion=2
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

snapshot/build.gradle.kts

+6-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ kotlin {
1515
sourceSets {
1616
val commonMain by getting {
1717
dependencies {
18-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3")
18+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
1919
}
2020
}
2121
val commonTest by getting {
@@ -27,33 +27,31 @@ kotlin {
2727
val jvmMain by getting {
2828
dependencies {
2929
implementation(kotlin("test-junit"))
30-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.3")
30+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
3131
}
3232
}
3333
val jvmTest by getting
3434
val androidMain by getting {
3535
dependsOn(jvmMain)
3636
dependencies {
37-
implementation("androidx.compose.ui:ui-test-junit4:1.2.0-rc01")
37+
implementation("androidx.compose.ui:ui-test-junit4:1.4.0")
3838
}
3939
}
40-
val androidTest by getting {
41-
dependsOn(jvmTest)
42-
}
4340

4441
all {
4542
languageSettings.optIn("kotlin.RequiresOptIn")
4643
}
4744
}
4845
}
4946

47+
@Suppress("UnstableApiUsage")
5048
android {
51-
compileSdk = 32
49+
compileSdk = 33
5250
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
5351
defaultConfig {
5452
minSdk = 21
55-
targetSdk = 32
5653
}
54+
namespace = "com.quickbird.snapshot"
5755
}
5856

5957
publishing {
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<manifest package="com.quickbird.snapshot"/>
1+
<manifest />

0 commit comments

Comments
 (0)