Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Android source set layout version 2 #245

Merged
merged 2 commits into from
May 17, 2023
Merged

Use Android source set layout version 2 #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21dd21c
Use Android source set layout version 2
twyatt May 16, 2023
46b5e86
Merge branch 'main' into twyatt/androidSourceSetLayoutVersion2
twyatt May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion box/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ kotlin {
}
}

val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(kotlin("test-junit"))
implementation(libs.androidx.test)
Expand Down
2 changes: 1 addition & 1 deletion element-view/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ kotlin {
}
}

val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(kotlin("test-junit"))
implementation(libs.androidx.test)
Expand Down
9 changes: 5 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=false
android.defaults.buildfeatures.resvalues=false

kotlin.js.compiler=IR

kotlin.mpp.enableCInteropCommonization=true
kotlin.mpp.androidSourceSetLayoutVersion=2

# Publication configuration
# https://github.com/vanniktech/gradle-maven-publish-plugin#setting-properties

Expand All @@ -33,7 +38,3 @@ POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=cedrickcooke
POM_DEVELOPER_NAME=Cedrick Cooke
POM_DEVELOPER_URL=https://github.com/cedrickcooke

kotlin.js.compiler=IR

kotlin.mpp.enableCInteropCommonization=true
2 changes: 1 addition & 1 deletion kanvas/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ kotlin {
}
}

val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(kotlin("test-junit"))
implementation(libs.androidx.test)
Expand Down
0 ...c/androidTest/kotlin/AndroidPaintTests.kt → ...droidUnitTest/kotlin/AndroidPaintTests.kt
View file
Open in desktop
File renamed without changes.
7 changes: 1 addition & 6 deletions sample/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import org.jetbrains.compose.compose
import org.jetbrains.compose.desktop.application.dsl.TargetFormat

plugins {
Expand Down Expand Up @@ -50,7 +49,7 @@ kotlin {
}
}

val androidTest by getting {
val androidUnitTest by getting {
dependencies {
implementation(kotlin("test-junit"))
}
Expand Down Expand Up @@ -112,10 +111,6 @@ android {
disable += "MissingClass"
disable += "UnusedResources"
}

sourceSets {
getByName("main").manifest.srcFile("src/androidMain/AndroidManifest.xml")
}
}

compose.desktop {
Expand Down