Skip to content

Commit baa0318

Browse files
Abduqodiri Qurbonzodailya-g
authored andcommitted
Introduce intermediate darwin sourceset for converters
- Use infra plugin hierarchical MPP structure - Get rid of the separate module
1 parent 2531be1 commit baa0318

File tree

6 files changed

+19
-62
lines changed

6 files changed

+19
-62
lines changed

build.gradle.kts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,21 @@ buildscript {
88
}
99

1010
plugins {
11-
id("kotlinx.team.infra") version "0.1.0-dev-51"
11+
id("kotlinx.team.infra") version "0.1.0-dev-53"
1212
}
1313

1414
project(":kotlinx-datetime") {
1515
pluginManager.apply("kotlin-multiplatform")
1616
// pluginManager.apply("maven-publish")
1717
}
1818

19-
project(":kotlinx-datetime-darwin") {
20-
pluginManager.apply("kotlin-multiplatform")
21-
}
22-
2319
infra {
2420
teamcity {
2521
bintrayUser = "%env.BINTRAY_USER%"
2622
bintrayToken = "%env.BINTRAY_API_KEY%"
2723
}
2824
publishing {
2925
include(":kotlinx-datetime")
30-
include(":kotlinx-datetime-darwin")
3126

3227
bintray {
3328
organization = "kotlin"

core/build.gradle.kts

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,20 @@ val JDK_8: String by project
2727

2828
kotlin {
2929
infra {
30-
target("macosX64")
31-
target("iosX64")
32-
target("iosArm64")
33-
target("iosArm32")
3430
target("linuxX64")
3531
target("mingwX64")
36-
target("watchosArm32")
37-
target("watchosArm64")
38-
target("watchosX86")
39-
target("tvosArm64")
40-
target("tvosX64")
32+
33+
common("darwin") {
34+
target("macosX64")
35+
target("iosX64")
36+
target("iosArm64")
37+
target("iosArm32")
38+
target("watchosArm32")
39+
target("watchosArm64")
40+
target("watchosX86")
41+
target("tvosArm64")
42+
target("tvosX64")
43+
}
4144
}
4245

4346
jvm {
@@ -87,6 +90,7 @@ kotlin {
8790
}
8891

8992
sourceSets.all {
93+
// println("SOURCE_SET: $name")
9094
kotlin.setSrcDirs(listOf("$name/src"))
9195
resources.setSrcDirs(listOf("$name/resources"))
9296
languageSettings.apply {
@@ -187,13 +191,11 @@ kotlin {
187191
val nativeTest by getting {
188192
}
189193

190-
// val mingwX64Main by getting {
191-
// kotlin.srcDir("nativeMain/cinterop_actuals")
192-
// }
193-
//
194-
// val linuxX64Main by getting {
195-
// kotlin.srcDir("nativeMain/cinterop_actuals")
196-
// }
194+
val darwinMain by getting {
195+
}
196+
197+
val darwinTest by getting {
198+
}
197199
}
198200
}
199201

darwin-integration/build.gradle.kts

Lines changed: 0 additions & 37 deletions
This file was deleted.

settings.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,3 @@ rootProject.name = 'Kotlin-DateTime-library'
1313

1414
include ':core'
1515
project(":core").name='kotlinx-datetime'
16-
17-
include ':darwin-integration'
18-
project(":darwin-integration").name='kotlinx-datetime-darwin'

0 commit comments

Comments
 (0)