Skip to content

Commit d24c263

Browse files
ReneeVanderveldeReneeVandervelde
committed
Update to kotlin hierachy template for platform configuration
1 parent c80c21a commit d24c263

10 files changed

Lines changed: 49 additions & 117 deletions

File tree

‎buildSrc/src/main/kotlin/library.gradle.kts‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
}
44

55
kotlin {
6+
applyDefaultHierarchyTemplate()
67
jvm()
78

89
js {
@@ -30,44 +31,4 @@ kotlin {
3031
linuxX64()
3132

3233
mingwX64()
33-
34-
sourceSets{
35-
val commonMain by sourceSets.getting
36-
37-
val linuxX64Main by sourceSets.getting
38-
val macosArm64Main by sourceSets.getting
39-
val macosX64Main by sourceSets.getting
40-
val mingwX64Main by sourceSets.getting
41-
42-
val nativeMain by sourceSets.creating {
43-
dependsOn(commonMain)
44-
linuxX64Main.dependsOn(this)
45-
macosArm64Main.dependsOn(this)
46-
macosX64Main.dependsOn(this)
47-
}
48-
49-
val windowsMain by sourceSets.creating {
50-
dependsOn(commonMain)
51-
mingwX64Main.dependsOn(this)
52-
}
53-
54-
val iosArm64Main by sourceSets.getting
55-
val iosX64Main by sourceSets.getting
56-
val watchosArm32Main by sourceSets.getting
57-
val watchosArm64Main by sourceSets.getting
58-
val watchosX64Main by sourceSets.getting
59-
val tvosArm64Main by sourceSets.getting
60-
val tvosX64Main by sourceSets.getting
61-
62-
val iosMain by sourceSets.creating {
63-
dependsOn(commonMain)
64-
iosArm64Main.dependsOn(this)
65-
iosX64Main.dependsOn(this)
66-
watchosArm32Main.dependsOn(this)
67-
watchosArm64Main.dependsOn(this)
68-
watchosX64Main.dependsOn(this)
69-
tvosArm64Main.dependsOn(this)
70-
tvosX64Main.dependsOn(this)
71-
}
72-
}
7334
}

‎discover/build.gradle.kts‎

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,40 @@ plugins {
66

77
kotlin {
88
sourceSets {
9-
val commonMain by getting {
10-
dependencies {
11-
implementation(libs.serialization.json)
12-
api(libs.coroutines.core)
13-
implementation(projects.serialization)
14-
api(projects.structures)
15-
16-
implementation(libs.ktor.client.core)
17-
implementation(libs.ktor.client.contentnegotiation)
18-
implementation(libs.ktor.serialization.json)
19-
}
9+
commonMain.dependencies {
10+
implementation(libs.serialization.json)
11+
api(libs.coroutines.core)
12+
implementation(projects.serialization)
13+
api(projects.structures)
14+
15+
implementation(libs.ktor.client.core)
16+
implementation(libs.ktor.client.contentnegotiation)
17+
implementation(libs.ktor.serialization.json)
2018
}
2119

22-
val commonTest by getting {
23-
dependencies {
24-
implementation(libs.test.core)
25-
implementation(libs.test.annotations)
26-
}
20+
commonTest.dependencies {
21+
implementation(libs.test.core)
22+
implementation(libs.test.annotations)
2723
}
2824

29-
val jvmMain by getting {
30-
dependencies {
31-
implementation(libs.ktor.client.okhttp)
32-
}
25+
jvmMain.dependencies {
26+
implementation(libs.ktor.client.okhttp)
3327
}
3428

35-
val nativeMain by getting {
36-
dependencies {
37-
implementation(libs.ktor.client.cio)
38-
}
29+
linuxMain.dependencies {
30+
implementation(libs.ktor.client.curl)
3931
}
4032

41-
val windowsMain by getting {
42-
dependencies {
43-
implementation(libs.ktor.client.winhttp)
44-
}
33+
mingwMain.dependencies {
34+
implementation(libs.ktor.client.winhttp)
4535
}
4636

47-
val iosMain by getting {
48-
dependencies {
49-
implementation(libs.ktor.client.darwin)
50-
}
37+
appleMain.dependencies {
38+
implementation(libs.ktor.client.darwin)
5139
}
5240

53-
val jsMain by getting {
54-
dependencies {
55-
implementation(libs.ktor.client.js)
56-
}
41+
jsMain.dependencies {
42+
implementation(libs.ktor.client.js)
5743
}
5844
}
5945
}

discover/src/iosMain/kotlin/inkapplications/shade/discover/PlatformModule.kt renamed to discover/src/appleMain/kotlin/inkapplications/shade/discover/PlatformModule.kt

File renamed without changes.

discover/src/nativeMain/kotlin/inkapplications/shade/discover/PlatformModule.kt renamed to discover/src/linuxMain/kotlin/inkapplications/shade/discover/PlatformModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package inkapplications.shade.discover
22

33
import io.ktor.client.engine.*
4-
import io.ktor.client.engine.cio.*
4+
import io.ktor.client.engine.curl.Curl
55

66
internal actual class PlatformModule actual constructor() {
7-
actual fun createEngine(): HttpClientEngineFactory<*> = CIO
7+
actual fun createEngine(): HttpClientEngineFactory<*> = Curl
88
}

discover/src/windowsMain/kotlin/inkapplications/shade/discover/PlatformModule.kt renamed to discover/src/mingwMain/kotlin/inkapplications/shade/discover/PlatformModule.kt

File renamed without changes.

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
version=2.0-SNAPSHOT
22
group=com.inkapplications.shade
33
org.gradle.jvmargs=-Xmx4g
4-
kotlin.mpp.applyDefaultHierarchyTemplate=false

‎internals/build.gradle.kts‎

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,42 @@ plugins {
66

77
kotlin {
88
sourceSets {
9-
val commonMain by getting {
10-
dependencies {
11-
implementation(libs.serialization.json)
12-
implementation(libs.ktor.client.core)
13-
implementation(projects.serialization)
14-
api(projects.structures)
15-
api(libs.kimchi.logger)
16-
17-
implementation(libs.ktor.client.contentnegotiation)
18-
implementation(libs.ktor.serialization.json)
19-
}
9+
commonMain.dependencies {
10+
implementation(libs.serialization.json)
11+
implementation(libs.ktor.client.core)
12+
implementation(projects.serialization)
13+
api(projects.structures)
14+
api(libs.kimchi.logger)
15+
16+
implementation(libs.ktor.client.contentnegotiation)
17+
implementation(libs.ktor.serialization.json)
2018
}
2119

22-
val jvmMain by getting {
23-
dependencies {
24-
implementation(libs.ktor.client.okhttp)
25-
implementation(libs.okhttp.tls)
26-
implementation(libs.okhttp.sse)
27-
}
20+
commonTest.dependencies {
21+
implementation(libs.test.core)
22+
implementation(libs.test.annotations)
2823
}
2924

30-
val jsMain by getting {
31-
dependencies {
32-
implementation(libs.ktor.client.js)
33-
}
25+
jvmMain.dependencies {
26+
implementation(libs.ktor.client.okhttp)
27+
implementation(libs.okhttp.tls)
28+
implementation(libs.okhttp.sse)
3429
}
3530

36-
val nativeMain by getting {
37-
dependencies {
38-
implementation(libs.ktor.client.curl)
39-
}
31+
jsMain.dependencies {
32+
implementation(libs.ktor.client.js)
4033
}
4134

42-
val windowsMain by getting {
43-
dependencies {
44-
implementation(libs.ktor.client.winhttp)
45-
}
35+
linuxMain.dependencies {
36+
implementation(libs.ktor.client.curl)
4637
}
4738

48-
val iosMain by getting {
49-
dependencies {
50-
implementation(libs.ktor.client.darwin)
51-
}
39+
mingwMain.dependencies {
40+
implementation(libs.ktor.client.winhttp)
5241
}
5342

54-
val commonTest by getting {
55-
dependencies {
56-
implementation(libs.test.core)
57-
implementation(libs.test.annotations)
58-
}
43+
appleMain.dependencies {
44+
implementation(libs.ktor.client.darwin)
5945
}
6046
}
6147
}

internals/src/iosMain/kotlin/inkapplications/shade/internals/PlatformModule.kt renamed to internals/src/appleMain/kotlin/inkapplications/shade/internals/PlatformModule.kt

File renamed without changes.

internals/src/nativeMain/kotlin/inkapplications/shade/internals/PlatformModule.kt renamed to internals/src/linuxMain/kotlin/inkapplications/shade/internals/PlatformModule.kt

File renamed without changes.

internals/src/windowsMain/kotlin/inkapplications/shade/internals/PlatformModule.kt renamed to internals/src/mingwMain/kotlin/inkapplications/shade/internals/PlatformModule.kt

File renamed without changes.

0 commit comments

Comments
 (0)