From efbc801836a2d0fe49cb1ea298db32b7efcf184f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Sun, 19 Apr 2020 12:12:04 +0200 Subject: [PATCH] Get rid of MultiPlatform Code, pt 2. (Remove linux modules) --- build.gradle.kts | 25 ------------------- .../de/pheerai/rcdbquery/SampleLinux.kt | 13 ---------- .../de/pheerai/rcdbquery/SampleTestsNative.kt | 11 -------- .../de/pheerai/rcdbquery/SampleLinux.kt | 13 ---------- .../de/pheerai/rcdbquery/SampleTestsNative.kt | 11 -------- .../de/pheerai/rcdbquery/SampleLinux.kt | 5 ---- .../de/pheerai/rcdbquery/SampleTestsNative.kt | 11 -------- 7 files changed, 89 deletions(-) delete mode 100644 src/linuxArm32Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt delete mode 100644 src/linuxArm32Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt delete mode 100644 src/linuxArm64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt delete mode 100644 src/linuxArm64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt delete mode 100644 src/linuxX64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt delete mode 100644 src/linuxX64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt diff --git a/build.gradle.kts b/build.gradle.kts index 1967cc5..e0d6fb7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget - plugins { id("org.jetbrains.kotlin.multiplatform") } @@ -26,21 +24,6 @@ kotlin { } } } - // For ARM, should be changed to iosArm32 or iosArm64 - // For Linux, should be changed to e.g. linuxX64 - // For MacOS, should be changed to e.g. macosX64 - // For Windows, should be changed to e.g. mingwX64 - - linuxX64("linuxX64") - linuxArm64("linuxArm64") - linuxArm32Hfp("linuxArm32") - targets.withType { - binaries { - executable { - entryPoint("de.pheerai.rcdbquery.main") - } - } - } sourceSets { commonMain { @@ -75,14 +58,6 @@ kotlin { implementation(kotlin("test-js")) } } - getByName("linuxX64Main") { - } - getByName("linuxX64Test") { - } - getByName("linuxArm64Main") { - } - getByName("linuxArm64Test") { - } all { languageSettings.enableLanguageFeature("InlineClasses") } diff --git a/src/linuxArm32Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt b/src/linuxArm32Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt deleted file mode 100644 index 3a44061..0000000 --- a/src/linuxArm32Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt +++ /dev/null @@ -1,13 +0,0 @@ -package de.pheerai.rcdbquery - -actual class Sample { - actual fun checkMe() = 7 -} - -actual object Platform { - actual val name: String = "Native" -} - -fun main() { - println(generateQueryUrl()) -} diff --git a/src/linuxArm32Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt b/src/linuxArm32Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt deleted file mode 100644 index b71ef62..0000000 --- a/src/linuxArm32Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt +++ /dev/null @@ -1,11 +0,0 @@ -package de.pheerai.rcdbquery - -import kotlin.test.Test -import kotlin.test.assertTrue - -class SampleTestsNative { - @Test - fun testHello() { - assertTrue("Native" in hello()) - } -} diff --git a/src/linuxArm64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt b/src/linuxArm64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt deleted file mode 100644 index 3a44061..0000000 --- a/src/linuxArm64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt +++ /dev/null @@ -1,13 +0,0 @@ -package de.pheerai.rcdbquery - -actual class Sample { - actual fun checkMe() = 7 -} - -actual object Platform { - actual val name: String = "Native" -} - -fun main() { - println(generateQueryUrl()) -} diff --git a/src/linuxArm64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt b/src/linuxArm64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt deleted file mode 100644 index b71ef62..0000000 --- a/src/linuxArm64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt +++ /dev/null @@ -1,11 +0,0 @@ -package de.pheerai.rcdbquery - -import kotlin.test.Test -import kotlin.test.assertTrue - -class SampleTestsNative { - @Test - fun testHello() { - assertTrue("Native" in hello()) - } -} diff --git a/src/linuxX64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt b/src/linuxX64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt deleted file mode 100644 index b83d1dc..0000000 --- a/src/linuxX64Main/kotlin/de/pheerai/rcdbquery/SampleLinux.kt +++ /dev/null @@ -1,5 +0,0 @@ -package de.pheerai.rcdbquery - -fun main() { - println(generateQueryUrl()) -} diff --git a/src/linuxX64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt b/src/linuxX64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt deleted file mode 100644 index 9b75c7b..0000000 --- a/src/linuxX64Test/kotlin/de/pheerai/rcdbquery/SampleTestsNative.kt +++ /dev/null @@ -1,11 +0,0 @@ -package de.pheerai.rcdbquery - -import kotlin.test.Test -import kotlin.test.assertTrue - -class SampleTestsNative { - @Test - fun testHello() { - assertTrue(true) - } -}