From 797c6668ca7d89c38b0ada8aaa6bb69c9a6c90e8 Mon Sep 17 00:00:00 2001 From: hfhbd Date: Tue, 9 May 2023 17:42:42 +0200 Subject: [PATCH 1/3] remove deprecated targets --- adapters/primitive-adapters/build.gradle | 2 -- .../multiplatform/MultiplatformConventions.kt | 2 -- drivers/driver-test/build.gradle | 2 -- drivers/native-driver/build.gradle | 16 +--------------- extensions/coroutines-extensions/build.gradle | 2 +- runtime/build.gradle | 2 -- 6 files changed, 2 insertions(+), 24 deletions(-) diff --git a/adapters/primitive-adapters/build.gradle b/adapters/primitive-adapters/build.gradle index 402193ab0e8..93cb027bcdb 100644 --- a/adapters/primitive-adapters/build.gradle +++ b/adapters/primitive-adapters/build.gradle @@ -8,8 +8,6 @@ plugins { archivesBaseName = 'sqldelight-primitive-adapters' kotlin { - mingwX86() - sourceSets { commonMain { dependencies { diff --git a/buildLogic/multiplatform-convention/src/main/kotlin/app/cash/sqldelight/multiplatform/MultiplatformConventions.kt b/buildLogic/multiplatform-convention/src/main/kotlin/app/cash/sqldelight/multiplatform/MultiplatformConventions.kt index ecf22d17687..6a0d6918d20 100644 --- a/buildLogic/multiplatform-convention/src/main/kotlin/app/cash/sqldelight/multiplatform/MultiplatformConventions.kt +++ b/buildLogic/multiplatform-convention/src/main/kotlin/app/cash/sqldelight/multiplatform/MultiplatformConventions.kt @@ -51,11 +51,9 @@ class MultiplatformConventions : Plugin { } iosX64() - iosArm32() iosArm64() tvosX64() tvosArm64() - watchosX86() watchosX64() watchosArm32() watchosArm64() diff --git a/drivers/driver-test/build.gradle b/drivers/driver-test/build.gradle index 531663dba9f..13c33ab03a5 100644 --- a/drivers/driver-test/build.gradle +++ b/drivers/driver-test/build.gradle @@ -9,8 +9,6 @@ sourceSets { } kotlin { - mingwX86() - sourceSets { commonMain { dependencies { diff --git a/drivers/native-driver/build.gradle b/drivers/native-driver/build.gradle index 0ea9eb06ef8..b8af3d244b5 100644 --- a/drivers/native-driver/build.gradle +++ b/drivers/native-driver/build.gradle @@ -8,16 +8,13 @@ plugins { kotlin { iosX64() - iosArm32() iosArm64() tvosX64() tvosArm64() - watchosX86() watchosX64() watchosArm32() watchosArm64() macosX64() - mingwX86() mingwX64() linuxX64() macosArm64() @@ -58,9 +55,6 @@ kotlin { mingwMain { dependsOn(nativeMain) } - mingwX86Main { - dependsOn(mingwMain) - } mingwX64Main { dependsOn(mingwMain) } @@ -69,7 +63,7 @@ kotlin { } } - configure([targets.iosX64, targets.iosArm32, targets.iosArm64, targets.tvosX64, targets.tvosArm64, targets.watchosX86, targets.watchosX64, targets.watchosArm32, targets.watchosArm64, targets.macosX64, targets.macosArm64, targets.iosSimulatorArm64, targets.watchosSimulatorArm64, targets.tvosSimulatorArm64]) { + configure([targets.iosX64, targets.iosArm64, targets.tvosX64, targets.tvosArm64, targets.watchosX64, targets.watchosArm32, targets.watchosArm64, targets.macosX64, targets.macosArm64, targets.iosSimulatorArm64, targets.watchosSimulatorArm64, targets.tvosSimulatorArm64]) { sourceSets.getByName("${name}Main").dependsOn(sourceSets.nativeDarwinMain) sourceSets.getByName("${name}Test").dependsOn(sourceSets.nativeTest) binaries.configureEach { @@ -93,14 +87,6 @@ kotlin { } } - configure([targets.mingwX86]) { - sourceSets.getByName("${name}Main").dependsOn(sourceSets.mingwMain) - sourceSets.getByName("${name}Test").dependsOn(sourceSets.nativeTest) - binaries.configureEach { - linkerOpts += ["-Lc:\\msys32\\mingw32\\lib", "-L$rootDir\\libs\\windows".toString(), "-lsqlite3"] - } - } - //linking fails for the linux test build if not built on a linux host //ensure the tests and linking for them is only done on linux hosts tasks.named("linuxX64Test") { enabled = HostManager.hostIsLinux } diff --git a/extensions/coroutines-extensions/build.gradle b/extensions/coroutines-extensions/build.gradle index 5575968fe76..8e23da942ed 100644 --- a/extensions/coroutines-extensions/build.gradle +++ b/extensions/coroutines-extensions/build.gradle @@ -45,7 +45,7 @@ kotlin { } } - configure([targets.iosX64, targets.iosArm32, targets.iosArm64, targets.tvosX64, targets.tvosArm64, targets.watchosX86, targets.watchosX64, targets.watchosArm32, targets.watchosArm64, targets.macosX64, targets.macosArm64, targets.iosSimulatorArm64, targets.watchosSimulatorArm64, targets.tvosSimulatorArm64]) { + configure([targets.iosX64, targets.iosArm64, targets.tvosX64, targets.tvosArm64, targets.watchosX64, targets.watchosArm32, targets.watchosArm64, targets.macosX64, targets.macosArm64, targets.iosSimulatorArm64, targets.watchosSimulatorArm64, targets.tvosSimulatorArm64]) { binaries.configureEach { linkerOpts += ['-lsqlite3'] } diff --git a/runtime/build.gradle b/runtime/build.gradle index c666906eebe..bc8ca63982f 100644 --- a/runtime/build.gradle +++ b/runtime/build.gradle @@ -11,8 +11,6 @@ sourceSets { } kotlin { - mingwX86() - sourceSets { commonMain { } From eb27fe43e5f11c1757a4c33d714ceaeb0fc3ac44 Mon Sep 17 00:00:00 2001 From: hfhbd Date: Tue, 9 May 2023 18:05:30 +0200 Subject: [PATCH 2/3] Fix tests --- extensions/coroutines-extensions/build.gradle | 1 - .../src/test/kotlin-mpp-configure-on-demand/build.gradle | 5 ----- sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle | 5 ----- .../kotlin/app/cash/sqldelight/tests/CompilationUnitTests.kt | 1 - 4 files changed, 12 deletions(-) diff --git a/extensions/coroutines-extensions/build.gradle b/extensions/coroutines-extensions/build.gradle index 8e23da942ed..c28b5cdfc87 100644 --- a/extensions/coroutines-extensions/build.gradle +++ b/extensions/coroutines-extensions/build.gradle @@ -56,7 +56,6 @@ kotlin { } } - // mingwX86 target is not supported by kotlinx.coroutines, see https://github.com/Kotlin/kotlinx.coroutines/issues/2157 configure([targets.mingwX64]) { binaries.configureEach { linkerOpts += ["-Lc:\\msys64\\mingw64\\lib", "-L$rootDir\\libs\\windows".toString(), "-lsqlite3"] diff --git a/sqldelight-gradle-plugin/src/test/kotlin-mpp-configure-on-demand/build.gradle b/sqldelight-gradle-plugin/src/test/kotlin-mpp-configure-on-demand/build.gradle index 29a8b1c6581..71b2e8a44cd 100644 --- a/sqldelight-gradle-plugin/src/test/kotlin-mpp-configure-on-demand/build.gradle +++ b/sqldelight-gradle-plugin/src/test/kotlin-mpp-configure-on-demand/build.gradle @@ -16,11 +16,6 @@ sqldelight { kotlin { targetFromPreset(presets.jvm, 'jvm') targetFromPreset(presets.js, 'js') - targetFromPreset(presets.iosArm32, 'iosArm32') { - binaries { - framework() - } - } targetFromPreset(presets.iosArm64, 'iosArm64') { binaries { framework() diff --git a/sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle b/sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle index a37689bef91..e72972f2bc2 100644 --- a/sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle +++ b/sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle @@ -16,11 +16,6 @@ sqldelight { kotlin { targetFromPreset(presets.jvm, 'jvm') js(IR) { } - targetFromPreset(presets.iosArm32, 'iosArm32') { - binaries { - framework() - } - } targetFromPreset(presets.iosArm64, 'iosArm64') { binaries { framework() diff --git a/sqldelight-gradle-plugin/src/test/kotlin/app/cash/sqldelight/tests/CompilationUnitTests.kt b/sqldelight-gradle-plugin/src/test/kotlin/app/cash/sqldelight/tests/CompilationUnitTests.kt index f3dd4898948..6bd3177de67 100644 --- a/sqldelight-gradle-plugin/src/test/kotlin/app/cash/sqldelight/tests/CompilationUnitTests.kt +++ b/sqldelight-gradle-plugin/src/test/kotlin/app/cash/sqldelight/tests/CompilationUnitTests.kt @@ -136,7 +136,6 @@ class CompilationUnitTests { |kotlin { | targetFromPreset(presets.jvm, 'jvm') | targetFromPreset(presets.js, 'js') - | targetFromPreset(presets.iosArm32, 'iosArm32') | targetFromPreset(presets.iosArm64, 'iosArm64') | targetFromPreset(presets.iosX64, 'iosX64') | targetFromPreset(presets.macosX64, 'macosX64') From ffcb4ead3d06f00cc2d9b0111e1105319ebe243f Mon Sep 17 00:00:00 2001 From: hfhbd Date: Tue, 9 May 2023 18:21:48 +0200 Subject: [PATCH 3/3] Fix tests --- sqldelight-gradle-plugin/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/sqldelight-gradle-plugin/build.gradle b/sqldelight-gradle-plugin/build.gradle index 615282ca206..5740583208a 100644 --- a/sqldelight-gradle-plugin/build.gradle +++ b/sqldelight-gradle-plugin/build.gradle @@ -91,7 +91,6 @@ tasks.named('test') { ":runtime:publishIosX64PublicationToInstallLocallyRepository", ":runtime:publishIosSimulatorArm64PublicationToInstallLocallyRepository", ":runtime:publishIosArm64PublicationToInstallLocallyRepository", - ":runtime:publishIosArm32PublicationToInstallLocallyRepository", ":runtime:publishMacosX64PublicationToInstallLocallyRepository", ) }