Skip to content

Commit b2765eb

Browse files
committed
Merged
2 parents 7d8009f + e46ca72 commit b2765eb

File tree

7 files changed

+20
-11
lines changed

7 files changed

+20
-11
lines changed

build.gradle.kts

-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +0,0 @@
1-
allprojects {
2-
repositories {
3-
mavenLocal()
4-
mavenCentral()
5-
google()
6-
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
7-
}
8-
}

settings.gradle.kts

+8
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,11 @@ pluginManagement {
99
}
1010
}
1111

12+
dependencyResolutionManagement {
13+
repositories {
14+
mavenLocal()
15+
mavenCentral()
16+
google()
17+
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
18+
}
19+
}

sqliter-driver/build.gradle.kts

+12-3
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ kotlin {
4646
watchosDeviceArm64(),
4747
mingwX64(),
4848
linuxX64(),
49+
linuxArm64(),
4950
)
5051

5152
knTargets
@@ -63,7 +64,6 @@ kotlin {
6364
}
6465
commonMain {
6566
dependencies {
66-
implementation("org.jetbrains.kotlin:kotlin-stdlib-common")
6767
}
6868
}
6969
commonTest {
@@ -78,10 +78,16 @@ kotlin {
7878
val appleMain = sourceSets.maybeCreate("appleMain").apply {
7979
dependsOn(nativeCommonMain)
8080
}
81-
val linuxMain = sourceSets.maybeCreate("linuxX64Main").apply {
81+
val linuxMain = sourceSets.maybeCreate("linuxMain").apply {
8282
dependsOn(nativeCommonMain)
8383
}
84-
84+
val linuxX64Main = sourceSets.maybeCreate("linuxX64Main").apply {
85+
dependsOn(linuxMain)
86+
}
87+
val linuxArm64Main = sourceSets.maybeCreate("linuxArm64Main").apply {
88+
dependsOn(linuxMain)
89+
}
90+
8591
val mingwMain = sourceSets.maybeCreate("mingwMain").apply {
8692
dependsOn(nativeCommonMain)
8793
}
@@ -114,8 +120,11 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {
114120

115121
if(!HostManager.hostIsLinux) {
116122
tasks.findByName("linuxX64Test")?.enabled = false
123+
tasks.findByName("linuxArm64Test")?.enabled = false
117124
tasks.findByName("linkDebugTestLinuxX64")?.enabled = false
125+
tasks.findByName("linkDebugTestLinuxArm64")?.enabled = false
118126
tasks.findByName("publishLinuxX64PublicationToMavenRepository")?.enabled = false
127+
tasks.findByName("publishLinuxArm64PublicationToMavenRepository")?.enabled = false
119128
}
120129

121130
if(!HostManager.hostIsMingw) {

0 commit comments

Comments
 (0)