Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
kotlinVersion = "1.6.10"
androidGradleVersion = "7.2.0"
androidGradleVersion = "7.3.1"

# kotlinx
kotlinxSerializationVersion = "1.2.1"
Expand Down Expand Up @@ -94,4 +94,4 @@ kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embe
detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektVersion" }
mokoMultiplatformPlugin = { module = "dev.icerock:mobile-multiplatform", version.ref = "mokoMultiplatformPluginVersion" }
composeJetBrainsPlugin = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeJetbrainsVersion" }
autoManifestPlugin = { module = "com.gradleup:auto-manifest-plugin", version = "1.1.1" }
autoManifestPlugin = { module = "com.gradleup:auto-manifest-plugin", version = "2.0" }
6 changes: 6 additions & 0 deletions resources/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,9 @@ val copyIosArm64TestResources = tasks.register<Copy>("copyIosArm64TestResources"
}

tasks.findByName("iosSimulatorArm64Test")!!.dependsOn(copyIosArm64TestResources)

listOf("iosX64Test","iosSimulatorArm64Test").forEach {
tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>(it){
deviceId = "iPhone 14"
}
}
5 changes: 5 additions & 0 deletions sample/android-mpp-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ android {

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
sourceSets{
this.getByName("main"){
res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
}
}
}

kotlin {
Expand Down
9 changes: 7 additions & 2 deletions sample/mpp-conditional/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ plugins {
}

android {
lintOptions {
disable("ImpliedQuantity")
lint {
disable += "ImpliedQuantity"
}
sourceSets{
this.getByName("main"){
res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
}
}
}

Expand Down
13 changes: 13 additions & 0 deletions sample/mpp-hierarhical/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ android {
testOptions {
unitTests.isIncludeAndroidResources = true
}

sourceSets{
this.getByName("main"){
res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
}
}
}

// CocoaPods requires the podspec to have a version.
Expand Down Expand Up @@ -112,6 +118,13 @@ kotlin {
}
}

listOf("iosX64Test","iosSimulatorArm64Test").forEach {
tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>(it){
deviceId = "iPhone 14"
}
}


multiplatformResources {
multiplatformResourcesPackage = "com.icerockdev.library"
disableStaticFrameworkWarning = true
Expand Down
15 changes: 14 additions & 1 deletion sample/mpp-library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,19 @@ plugins {

android {
namespace = "com.icerockdev.library"

lint {
disable += "ImpliedQuantity"
}
testOptions {
unitTests {
isIncludeAndroidResources = true
}
}
sourceSets{
this.getByName("main"){
res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
}
}
}

kotlin {
Expand All @@ -33,6 +40,12 @@ kotlin {
}
}

listOf("iosX64Test","iosSimulatorArm64Test").forEach {
tasks.getByName<org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeSimulatorTest>(it){
deviceId = "iPhone 14"
}
}

dependencies {
commonMainApi(projects.resources)
commonMainApi(libs.mokoGraphics)
Expand Down
9 changes: 9 additions & 0 deletions sample/mpp-library/nested-module/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ plugins {
id("com.gradleup.auto.manifest")
}

android {
sourceSets{
this.getByName("main"){
res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
}
}
}


dependencies {
commonMainApi(projects.resources)
}
Expand Down
9 changes: 7 additions & 2 deletions sample/mpp-mixed/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ plugins {
}

android {
lintOptions {
disable("ImpliedQuantity")
lint {
disable += "ImpliedQuantity"
}
sourceSets{
this.getByName("main"){
res.srcDir(File(buildDir, "generated/moko/androidMain/res"))
}
}
}

Expand Down