8000 chore: use default target hierarchy template by vitorhugods · Pull Request #101 · mockative/mockative · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

chore: use default target hierarchy template #101

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

Merged
merged 1 commit into from
May 16, 2024
Merged

chore: use default target hierarchy template #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 1 addition & 61 deletions buildSrc/src/main/kotlin/convention.multiplatform.gradle.kts
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -42,65 +42,5 @@ kotlin {
nodejs()
generateTypeScriptDefinitions()
}

@Suppress("UNUSED_VARIABLE")
sourceSets {
// Common
val commonMain by getting

// JVM
val jvmMain by getting

// JS
val jsMain by getting

// Native
val nativeMain by creating { dependsOn(commonMain) }

// Darwin (iOS, watchOS, tvOS, macOS)
val darwinMain by creating { dependsOn(nativeMain) }

// iOS
val iosMain by creating { dependsOn(darwinMain) }

val iosX64Main by getting { dependsOn(iosMain) }
val iosArm64Main by getting { dependsOn(iosMain) }
val iosSimulatorArm64Main by getting { dependsOn(iosMain) }

// watchOS
val watchosMain by creating { dependsOn(darwinMain) }

val watchosArm32Main by getting { dependsOn(watchosMain) }
val watchosArm64Main by getting { dependsOn(watchosMain) }
val watchosX64Main by getting { dependsOn(watchosMain) }
val watchosSimulatorArm64Main by getting { dependsOn(watchosMain) }
val watchosDeviceArm64Main by getting { dependsOn(watchosMain) }

// tvOS
val tvosMain by creating { dependsOn(darwinMain) }

val tvosArm64Main by getting { dependsOn(tvosMain) }
val tvosX64Main by getting { dependsOn(tvosMain) }
val tvosSimulatorArm64Main by getting { dependsOn(tvosMain) }

// macOS
val macosMain by creating { dependsOn(darwinMain) }

val macosX64Main by getting { dependsOn(macosMain) }
val macosArm64Main by getting { dependsOn(macosMain) }

// Linux
val linuxMain by creating { dependsOn(nativeMain) }

val linuxArm64Main by getting { dependsOn(linuxMain) }
val linuxX64Main by getting { dependsOn(linuxMain) }

// mingw (Windows)
val mingwMain by creating { dependsOn(nativeMain) }

val mingwX64Main by getting { dependsOn(mingwMain) }

// wasm
val wasmJsMain by getting { dependsOn(commonMain) }
}
applyDefaultHierarchyTemplate()
}
22 changes: 8 additions & 14 deletions shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget

plugins {
kotlin("multiplatform")
kotlin("plugin.allopen")
Expand All @@ -24,21 +22,19 @@ kotlin {

androidTarget()

val iosTarget: (String, KotlinNativeTarget.() -> Unit) -> KotlinNativeTarget = when {
System.getenv("SDK_NAME")?.startsWith("iphoneos") == true -> ::iosArm64
System.getenv("NATIVE_ARCH")?.startsWith("arm") == true -> ::iosSimulatorArm64
System.getProperty("os.arch") == "aarch64"-> ::iosSimulatorArm64
else -> ::iosX64
}

iosTarget("ios") {
val iosX64 = iosX64()
val iosArm64 = iosArm64()
val iosSimulatorArm64 = iosSimulatorArm64()
configure(listOf(iosX64, iosArm64, iosSimulatorArm64)) {
binaries {
framework {
baseName = "shared"
}
}
}

applyDefaultHierarchyTemplate()

sourceSets {
named("commonMain") {
dependencies {
Expand Down Expand Up @@ -73,17 +69,15 @@ kotlin {
dependsOn(androidUnitTest)
}

// named("iosMain")
named("iosTest") {
// named("appleMain")
named("appleTest") {
dependencies {
implementation(project(":mockative"))
}

languageSettings {
optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
}

kotlin.srcDir(File(buildDir, "generated/ksp/ios/iosTest/kotlin"))
}

// named("jsMain")
Expand Down
0 ...c/iosMain/kotlin/io/github/ExpectedAPI.kt → ...appleMain/kotlin/io/github/ExpectedAPI.kt
View file
Open in desktop
File renamed without changes.
0 ...src/iosMain/kotlin/io/github/OptInType.kt → ...c/appleMain/kotlin/io/github/OptInType.kt
View file
Open in desktop
File renamed without changes.
0 ...osTest/kotlin/io/github/OptInTypeTests.kt → ...leTest/kotlin/io/github/OptInTypeTests.kt
View file
Open in desktop
File renamed without changes.
Loading
0