Skip to content

Commit 73eac70

Browse files
pahillpahill
authored
Merge pull request #80 from Kotlin/v2_update
Update to Kotlin v2 and new wizard
2 parents 3eeb2ff + 4caa7bc commit 73eac70

File tree

49 files changed

+704
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+704
-265
lines changed

‎.github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
uses: actions/[email protected]
1212
with:
1313
distribution: 'adopt'
14-
java-version: '11'
14+
java-version: '17'
1515
- name: Build the project
1616
run: ./gradlew assemble

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
build/
44
.idea/
55
.DS_STORE
6+
.kotlin
67
local.properties

‎androidApp/build.gradle.kts

-47
This file was deleted.

‎build.gradle.kts

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
plugins {
2-
//trick: for the same plugin versions in all sub-modules
3-
id("com.android.application").version("8.1.2").apply(false)
4-
id("com.android.library").version("8.1.2").apply(false)
5-
kotlin("android").version("1.9.22").apply(false)
6-
kotlin("multiplatform").version("1.9.22").apply(false)
2+
// this is necessary to avoid the plugins to be loaded multiple times
3+
// in each subproject's classloader
4+
alias(libs.plugins.androidApplication) apply false
5+
alias(libs.plugins.androidLibrary) apply false
6+
alias(libs.plugins.jetbrainsCompose) apply false
7+
alias(libs.plugins.compose.compiler) apply false
8+
alias(libs.plugins.kotlinMultiplatform) apply false
79
}

‎composeApp/build.gradle.kts

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3+
4+
plugins {
5+
alias(libs.plugins.kotlinMultiplatform)
6+
alias(libs.plugins.androidApplication)
7+
alias(libs.plugins.jetbrainsCompose)
8+
alias(libs.plugins.compose.compiler)
9+
}
10+
11+
kotlin {
12+
androidTarget {
13+
@OptIn(ExperimentalKotlinGradlePluginApi::class)
14+
compilerOptions {
15+
jvmTarget.set(JvmTarget.JVM_11)
16+
}
17+
}
18+
19+
sourceSets {
20+
androidMain.dependencies {
21+
implementation(compose.preview)
22+
implementation(libs.androidx.activity.compose)
23+
implementation(project(":shared"))
24+
implementation(libs.androidx.material)
25+
implementation(libs.androidx.appcompat)
26+
implementation(libs.androidx.constraintlayout)
27+
28+
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
29+
implementation(libs.activity.compose)
30+
implementation(libs.androidx.ui)
31+
implementation(libs.androidx.ui.graphics)
32+
implementation(libs.androidx.material3)
33+
}
34+
commonMain.dependencies {
35+
implementation(compose.runtime)
36+
implementation(compose.foundation)
37+
implementation(compose.material)
38+
implementation(compose.ui)
39+
implementation(compose.components.resources)
40+
implementation(compose.components.uiToolingPreview)
41+
implementation(projects.shared)
42+
}
43+
}
44+
}
45+
46+
android {
47+
namespace = "com.jetbrains.basicsample"
48+
compileSdk = libs.versions.android.compileSdk.get().toInt()
49+
50+
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
51+
sourceSets["main"].res.srcDirs("src/androidMain/res")
52+
sourceSets["main"].resources.srcDirs("src/commonMain/resources")
53+
54+
defaultConfig {
55+
applicationId = "com.jetbrains.basicsample"
56+
minSdk = libs.versions.android.minSdk.get().toInt()
57+
targetSdk = libs.versions.android.targetSdk.get().toInt()
58+
versionCode = 1
59+
versionName = "1.0"
60+
}
61+
packaging {
62+
resources {
63+
excludes += "/META-INF/{AL2.0,LGPL2.1}"
64+
}
65+
}
66+
buildTypes {
67+
getByName("release") {
68+
isMinifyEnabled = false
69+
}
70+
}
71+
compileOptions {
72+
sourceCompatibility = JavaVersion.VERSION_11
73+
targetCompatibility = JavaVersion.VERSION_11
74+
}
75+
buildFeatures {
76+
compose = true
77+
}
78+
dependencies {
79+
debugImplementation(compose.uiTooling)
80+
}
81+
}
82+

‎androidApp/src/main/AndroidManifest.xml ‎composeApp/src/androidMain/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:supportsRtl="true"
77
android:theme="@style/AppTheme">
88
<activity
9-
android:name="com.jetbrains.kmm.androidApp.MainActivity"
9+
android:name="com.jetbrains.basicsample.MainActivity"
1010
android:exported="true">
1111
<intent-filter>
1212
<action android:name="android.intent.action.MAIN" />

‎androidApp/src/main/java/com/jetbrains/kmm/androidApp/MainActivity.kt ‎composeApp/src/androidMain/kotlin/com/jetbrains/basicsample/MainActivity.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jetbrains.kmm.androidApp
1+
package com.jetbrains.basicsample
22

33
import android.os.Bundle
44
import androidx.activity.ComponentActivity
@@ -20,8 +20,6 @@ import androidx.compose.ui.Alignment
2020
import androidx.compose.ui.Modifier
2121
import androidx.compose.ui.text.input.KeyboardType
2222
import androidx.compose.ui.unit.dp
23-
import com.jetbrains.kmm.shared.Calculator
24-
import com.jetbrains.kmm.shared.Greeting
2523

2624
fun greet(): String {
2725
return Greeting().greeting()

‎composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
8+
<aapt:attr name="android:fillColor">
9+
<gradient
10+
android:endX="85.84757"
11+
android:endY="92.4963"
12+
android:startX="42.9492"
13+
android:startY="49.59793"
14+
android:type="linear">
15+
<item
16+
android:color="#44000000"
17+
android:offset="0.0" />
18+
<item
19+
android:color="#00000000"
20+
android:offset="1.0" />
21+
</gradient>
22+
</aapt:attr>
23+
</path>
24+
<path
25+
android:fillColor="#FFFFFF"
26+
android:fillType="nonZero"
27+
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
28+
android:strokeWidth="1"
29+
android:strokeColor="#00000000" />
30+
</vector>

‎composeApp/src/androidMain/res/drawable/ic_launcher_background.xml

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<path
8+
android:fillColor="#3DDC84"
9+
android:pathData="M0,0h108v108h-108z" />
10+
<path
11+
android:fillColor="#00000000"
12+
android:pathData="M9,0L9,108"
13+
android:strokeWidth="0.8"
14+
android:strokeColor="#33FFFFFF" />
15+
<path
16+
android:fillColor="#00000000"
17+
android:pathData="M19,0L19,108"
18+
android:strokeWidth="0.8"
19+
android:strokeColor="#33FFFFFF" />
20+
<path
21+
android:fillColor="#00000000"
22+
android:pathData="M29,0L29,108"
23+
android:strokeWidth="0.8"
24+
android:strokeColor="#33FFFFFF" />
25+
<path
26+
android:fillColor="#00000000"
27+
android:pathData="M39,0L39,108"
28+
android:strokeWidth="0.8"
29+
android:strokeColor="#33FFFFFF" />
30+
<path
31+
android:fillColor="#00000000"
32+
android:pathData="M49,0L49,108"
33+
android:strokeWidth="0.8"
34+
android:strokeColor="#33FFFFFF" />
35+
<path
36+
android:fillColor="#00000000"
37+
android:pathData="M59,0L59,108"
38+
android:strokeWidth="0.8"
39+
android:strokeColor="#33FFFFFF" />
40+
<path
41+
android:fillColor="#00000000"
42+
android:pathData="M69,0L69,108"
43+
android:strokeWidth="0.8"
44+
android:strokeColor="#33FFFFFF" />
45+
<path
46+
android:fillColor="#00000000"
47+
android:pathData="M79,0L79,108"
48+
android:strokeWidth="0.8"
49+
android:strokeColor="#33FFFFFF" />
50+
<path
51+
android:fillColor="#00000000"
52+
android:pathData="M89,0L89,108"
53+
android:strokeWidth="0.8"
54+
android:strokeColor="#33FFFFFF" />
55+
<path
56+
android:fillColor="#00000000"
57+
android:pathData="M99,0L99,108"
58+
android:strokeWidth="0.8"
59+
android:strokeColor="#33FFFFFF" />
60+
<path
61+
android:fillColor="#00000000"
62+
android:pathData="M0,9L108,9"
63+
android:strokeWidth="0.8"
64+
android:strokeColor="#33FFFFFF" />
65+
<path
66+
android:fillColor="#00000000"
67+
android:pathData="M0,19L108,19"
68+
android:strokeWidth="0.8"
69+
android:strokeColor="#33FFFFFF" />
70+
<path
71+
android:fillColor="#00000000"
72+
android:pathData="M0,29L108,29"
73+
android:strokeWidth="0.8"
74+
android:strokeColor="#33FFFFFF" />
75+
<path
76+
android:fillColor="#00000000"
77+
android:pathData="M0,39L108,39"
78+
android:strokeWidth="0.8"
79+
android:strokeColor="#33FFFFFF" />
80+
<path
81+
android:fillColor="#00000000"
82+
android:pathData="M0,49L108,49"
83+
android:strokeWidth="0.8"
84+
android:strokeColor="#33FFFFFF" />
85+
<path
86+
android:fillColor="#00000000"
87+
android:pathData="M0,59L108,59"
88+
android:strokeWidth="0.8"
89+
android:strokeColor="#33FFFFFF" />
90+
<path
91+
android:fillColor="#00000000"
92+
android:pathData="M0,69L108,69"
93+
android:strokeWidth="0.8"
94+
android:strokeColor="#33FFFFFF" />
95+
<path
96+
android:fillColor="#00000000"
97+
android:pathData="M0,79L108,79"
98+
android:strokeWidth="0.8"
99+
android:strokeColor="#33FFFFFF" />
100+
<path
101+
android:fillColor="#00000000"
102+
android:pathData="M0,89L108,89"
103+
android:strokeWidth="0.8"
104+
android:strokeColor="#33FFFFFF" />
105+
<path
106+
android:fillColor="#00000000"
107+
android:pathData="M0,99L108,99"
108+
android:strokeWidth="0.8"
109+
android:strokeColor="#33FFFFFF" />
110+
<path
111+
android:fillColor="#00000000"
112+
android:pathData="M19,29L89,29"
113+
android:strokeWidth="0.8"
114+
android:strokeColor="#33FFFFFF" />
115+
<path
116+
android:fillColor="#00000000"
117+
android:pathData="M19,39L89,39"
118+
android:strokeWidth="0.8"
119+
android:strokeColor="#33FFFFFF" />
120+
<path
121+
android:fillColor="#00000000"
122+
android:pathData="M19,49L89,49"
123+
android:strokeWidth="0.8"
124+
android:strokeColor="#33FFFFFF" />
125+
<path
126+
android:fillColor="#00000000"
127+
android:pathData="M19,59L89,59"
128+
android:strokeWidth="0.8"
129+
android:strokeColor="#33FFFFFF" />
130+
<path
131+
android:fillColor="#00000000"
132+
android:pathData="M19,69L89,69"
133+
android:strokeWidth="0.8"
134+
android:strokeColor="#33FFFFFF" />
135+
<path
136+
android:fillColor="#00000000"
137+
android:pathData="M19,79L89,79"
138+
android:strokeWidth="0.8"
139+
android:strokeColor="#33FFFFFF" />
140+
<path
141+
android:fillColor="#00000000"
142+
android:pathData="M29,19L29,89"
143+
android:strokeWidth="0.8"
144+
android:strokeColor="#33FFFFFF" />
145+
<path
146+
android:fillColor="#00000000"
147+
android:pathData="M39,19L39,89"
148+
android:strokeWidth="0.8"
149+
android:strokeColor="#33FFFFFF" />
150+
<path
151+
android:fillColor="#00000000"
152+
android:pathData="M49,19L49,89"
153+
android:strokeWidth="0.8"
154+
android:strokeColor="#33FFFFFF" />
155+
<path
156+
android:fillColor="#00000000"
157+
android:pathData="M59,19L59,89"
158+
android:strokeWidth="0.8"
159+
android:strokeColor="#33FFFFFF" />
160+
<path
161+
android:fillColor="#00000000"
162+
android:pathData="M69,19L69,89"
163+
android:strokeWidth="0.8"
164+
android:strokeColor="#33FFFFFF" />
165+
<path
166+
android:fillColor="#00000000"
167+
android:pathData="M79,19L79,89"
168+
android:strokeWidth="0.8"
169+
android:strokeColor="#33FFFFFF" />
170+
</vector>

‎composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@drawable/ic_launcher_background" />
4+
<foreground android:drawable="@drawable/ic_launcher_foreground" />
5+
</adaptive-icon>

0 commit comments

Comments
 (0)