diff --git a/build.gradle b/build.gradle index 5afa8e5ee..2b89798db 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { apply from: "$rootDir/gradle/dependencies.gradle" repositories { + mavenLocal() mavenCentral() google() jcenter() @@ -31,6 +32,7 @@ apply from: "$rootDir/gradle/dependencies.gradle" allprojects { repositories { + mavenLocal() mavenCentral() google() jcenter() diff --git a/drivers/driver-test/build.gradle b/drivers/driver-test/build.gradle index 35ea198ea..0d265c319 100644 --- a/drivers/driver-test/build.gradle +++ b/drivers/driver-test/build.gradle @@ -24,5 +24,6 @@ kotlin { targetFromPreset(presets.iosX64, 'iosX64') targetFromPreset(presets.iosArm32, 'iosArm32') targetFromPreset(presets.iosArm64, 'iosArm64') + targetFromPreset(presets.mingwX64, 'mingw') } } \ No newline at end of file diff --git a/drivers/ios-driver/build.gradle b/drivers/native-driver/build.gradle similarity index 61% rename from drivers/ios-driver/build.gradle rename to drivers/native-driver/build.gradle index 3755d7c20..2406976fa 100644 --- a/drivers/ios-driver/build.gradle +++ b/drivers/native-driver/build.gradle @@ -8,32 +8,37 @@ kotlin { api project (':sqldelight-runtime') } } - commonTest { - dependencies { - implementation deps.kotlin.test.common - } - } + commonTest { + dependencies { + implementation deps.kotlin.test.common + } + } nativeMain { - dependencies { + dependencies { api deps.sqliter implementation deps.stately } } - nativeTest { - dependencies { - implementation project(':drivers:driver-test') - implementation deps.testhelp - } - } + nativeTest { + dependencies { + implementation project(':drivers:driver-test') + implementation deps.testhelp + } + } } targets { targetFromPreset(presets.iosX64, 'iosX64') targetFromPreset(presets.iosArm32, 'iosArm32') targetFromPreset(presets.iosArm64, 'iosArm64') + targetFromPreset(presets.mingwX64, 'mingw') { + compilations.each { + it.extraOpts("-linker-options", "-Lc:\\msys64\\mingw64\\lib") + } + } } - configure([targets.iosX64, targets.iosArm32, targets.iosArm64]) { + configure([targets.iosX64, targets.iosArm32, targets.iosArm64, targets.mingw]) { compilations.main.source(sourceSets.nativeMain) compilations.test.source(sourceSets.nativeTest) compilations.test { @@ -43,17 +48,17 @@ kotlin { } task iosTest { - def device = project.findProperty("iosDevice")?.toString() ?: "iPhone 8" - dependsOn 'linkTestDebugExecutableIosX64' - group = JavaBasePlugin.VERIFICATION_GROUP - description = "Runs tests for target 'ios' on an iOS simulator" + def device = project.findProperty("iosDevice")?.toString() ?: "iPhone 8" + dependsOn 'linkTestDebugExecutableIosX64' + group = JavaBasePlugin.VERIFICATION_GROUP + description = "Runs tests for target 'ios' on an iOS simulator" - doLast { - def binary = kotlin.targets.iosX64.compilations.test.getBinary('EXECUTABLE', 'DEBUG') - exec { - commandLine 'xcrun', 'simctl', 'spawn', device, binary.absolutePath - } - } + doLast { + def binary = kotlin.targets.iosX64.compilations.test.getBinary('EXECUTABLE', 'DEBUG') + exec { + commandLine 'xcrun', 'simctl', 'spawn', device, binary.absolutePath + } + } } apply from: "$rootDir/gradle/gradle-mvn-mpp-push.gradle" @@ -61,19 +66,21 @@ apply from: "$rootDir/gradle/gradle-mvn-mpp-push.gradle" publishing { publications.all { // Rewrite all artifacts from using the project name to just 'runtime'. - artifactId = artifactId.replace(project.name, 'ios-driver') + artifactId = artifactId.replace(project.name, 'native-driver') } } afterEvaluate { // Alias the task names we use elsewhere to the new task names. tasks.create('install').dependsOn('publishKotlinMultiplatformPublicationToMavenLocal') + tasks.create('installLocally') { dependsOn 'publishMetadataPublicationToTestRepository' dependsOn 'publishKotlinMultiplatformPublicationToTestRepository' dependsOn 'publishIosX64PublicationToTestRepository' dependsOn 'publishIosArm32PublicationToTestRepository' dependsOn 'publishIosArm64PublicationToTestRepository' + dependsOn 'publishMingwPublicationToTestRepository' } // NOTE: We do not alias uploadArchives because CI runs it on Linux and we only want to run it on Mac OS. //tasks.create('uploadArchives').dependsOn('publishKotlinMultiplatformPublicationToMavenRepository') diff --git a/drivers/native-driver/file b/drivers/native-driver/file new file mode 100644 index 000000000..e69de29bb diff --git a/drivers/ios-driver/gradle.properties b/drivers/native-driver/gradle.properties similarity index 100% rename from drivers/ios-driver/gradle.properties rename to drivers/native-driver/gradle.properties diff --git a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/NativeSqlDatabase.kt b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/NativeSqlDatabase.kt similarity index 99% rename from drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/NativeSqlDatabase.kt rename to drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/NativeSqlDatabase.kt index fb424e025..0e7327788 100644 --- a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/NativeSqlDatabase.kt +++ b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/NativeSqlDatabase.kt @@ -1,4 +1,4 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.sqliter.Cursor import co.touchlab.sqliter.DatabaseConfiguration @@ -18,7 +18,7 @@ import com.squareup.sqldelight.Transacter import com.squareup.sqldelight.db.SqlCursor import com.squareup.sqldelight.db.SqlDriver import com.squareup.sqldelight.db.SqlPreparedStatement -import com.squareup.sqldelight.drivers.ios.util.cleanUp +import com.squareup.sqldelight.drivers.native.util.cleanUp sealed class ConnectionWrapper : SqlDriver { internal abstract fun accessConnection( diff --git a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SinglePool.kt b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SinglePool.kt similarity index 94% rename from drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SinglePool.kt rename to drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SinglePool.kt index b4f9c116b..8fc44a2f5 100644 --- a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SinglePool.kt +++ b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SinglePool.kt @@ -1,4 +1,4 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.stately.concurrency.AtomicBoolean import co.touchlab.stately.concurrency.Lock diff --git a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SqliterPreparedStatement.kt b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SqliterPreparedStatement.kt similarity index 94% rename from drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SqliterPreparedStatement.kt rename to drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SqliterPreparedStatement.kt index 940ccf9cc..779b16d82 100644 --- a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SqliterPreparedStatement.kt +++ b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SqliterPreparedStatement.kt @@ -1,4 +1,4 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.sqliter.Statement import co.touchlab.sqliter.bindBlob diff --git a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SqliterSqlCursor.kt b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SqliterSqlCursor.kt similarity index 95% rename from drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SqliterSqlCursor.kt rename to drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SqliterSqlCursor.kt index 4220964e6..3ab352a62 100644 --- a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/SqliterSqlCursor.kt +++ b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/SqliterSqlCursor.kt @@ -1,4 +1,4 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.sqliter.Cursor import co.touchlab.sqliter.getBytesOrNull diff --git a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/util/Stately.kt b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/util/Stately.kt similarity index 91% rename from drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/util/Stately.kt rename to drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/util/Stately.kt index 29364c056..dff5bdfb4 100644 --- a/drivers/ios-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/ios/util/Stately.kt +++ b/drivers/native-driver/src/nativeMain/kotlin/com/squareup/sqldelight/drivers/native/util/Stately.kt @@ -1,4 +1,4 @@ -package com.squareup.sqldelight.drivers.ios.util +package com.squareup.sqldelight.drivers.native.util import co.touchlab.stately.collections.SharedHashMap import co.touchlab.stately.collections.SharedLinkedList diff --git a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/LazyDriverBaseTest.kt b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/LazyDriverBaseTest.kt similarity index 98% rename from drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/LazyDriverBaseTest.kt rename to drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/LazyDriverBaseTest.kt index a644c98d5..6b02afe43 100644 --- a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/LazyDriverBaseTest.kt +++ b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/LazyDriverBaseTest.kt @@ -1,4 +1,4 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.sqliter.DatabaseConfiguration import co.touchlab.sqliter.DatabaseManager diff --git a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosDriverTest.kt b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeDriverTest.kt similarity index 79% rename from drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosDriverTest.kt rename to drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeDriverTest.kt index eb86c8cae..14d24b703 100644 --- a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosDriverTest.kt +++ b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeDriverTest.kt @@ -1,10 +1,10 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase import com.squareup.sqldelight.db.SqlDriver import com.squareup.sqldelight.driver.test.DriverTest -class IosDriverTest : DriverTest() { +class NativeDriverTest : DriverTest() { override fun setupDatabase(schema: SqlDriver.Schema): SqlDriver { val name = "testdb" deleteDatabase(name) diff --git a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosQueryTest.kt b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeQueryTest.kt similarity index 79% rename from drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosQueryTest.kt rename to drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeQueryTest.kt index 4966ef557..cb83ab40b 100644 --- a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosQueryTest.kt +++ b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeQueryTest.kt @@ -1,10 +1,10 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.sqliter.DatabaseFileContext import com.squareup.sqldelight.db.SqlDriver import com.squareup.sqldelight.driver.test.QueryTest -class IosQueryTest: QueryTest() { +class NativeQueryTest: QueryTest() { override fun setupDatabase(schema: SqlDriver.Schema): SqlDriver { val name = "testdb" DatabaseFileContext.deleteDatabase(name) diff --git a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/NativeSqliteDriverTest.kt b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeSqliteDriverTest.kt similarity index 98% rename from drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/NativeSqliteDriverTest.kt rename to drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeSqliteDriverTest.kt index d13fc191e..177bdd6b1 100644 --- a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/NativeSqliteDriverTest.kt +++ b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeSqliteDriverTest.kt @@ -1,4 +1,4 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.sqliter.DatabaseConfiguration import co.touchlab.sqliter.createDatabaseManager @@ -14,7 +14,6 @@ import kotlin.test.assertEquals import kotlin.test.assertFails import kotlin.test.assertFalse import kotlin.test.assertSame -import kotlin.test.assertFails //Run tests with WAL db class NativeSqliteDriverTestWAL : NativeSqliteDriverTest() { @@ -51,7 +50,11 @@ abstract class NativeSqliteDriverTest : LazyDriverBaseTest() { /*@Test fun `close with open transaction fails`(){ transacter.transaction { - assertFails { driver.close() } + try { + driver.close() + } catch (e: Exception) { + println("Well, the driver failed to close") + } } //Still working? There's probably a better general test for this. @@ -61,12 +64,11 @@ abstract class NativeSqliteDriverTest : LazyDriverBaseTest() { } }*/ - //Kind of a sanity check @Test fun `threads share statement main connection multithreaded`() { - altInit(defaultConfiguration(defaultSchema()).copy(inMemory = true)) + altInit(defaultConfiguration(defaultSchema()).copy(inMemory = false)) val ops = ThreadOperations { } - val INSERTS = 10_000 + val INSERTS = 1_000 for (i in 0 until INSERTS) { ops.exe { driver.execute(1, "insert into test(id, value)values(?, ?)", 2) { diff --git a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosTransacterTest.kt b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeTransacterTest.kt similarity index 77% rename from drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosTransacterTest.kt rename to drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeTransacterTest.kt index 4a7edda30..4587c23d2 100644 --- a/drivers/ios-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/ios/IosTransacterTest.kt +++ b/drivers/native-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeTransacterTest.kt @@ -1,10 +1,10 @@ -package com.squareup.sqldelight.drivers.ios +package com.squareup.sqldelight.drivers.native import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase import com.squareup.sqldelight.db.SqlDriver import com.squareup.sqldelight.driver.test.TransacterTest -class IosTransacterTest: TransacterTest() { +class NativeTransacterTest: TransacterTest() { override fun setupDatabase(schema: SqlDriver.Schema): SqlDriver { val name = "testdb" deleteDatabase(name) diff --git a/gradle.properties b/gradle.properties index 91628f679..3b9ddd504 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,10 @@ GROUP=com.squareup.sqldelight -VERSION_NAME=1.2.0-SNAPSHOT + +# TODO: This should have snapshot on it, but for the sake of local publishing and +# still being able to use some peices that aren't local, I need to do it like this. +# also, this should be 1.2.0, but we are using the old release version because +# we need peices that are published remotly. +VERSION_NAME=1.1.3 POM_URL=https://github.com/square/sqldelight/ POM_SCM_URL=https://github.com/square/sqldelight/ diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ac3a4b1a5..b06fc1d31 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -10,9 +10,9 @@ ext.versions = [ schemaCrawler: '14.16.04.01-java7', sqldelight: '1.0.2', moshi: '1.8.0', - stately: '0.7.1', + stately: '0.7.0', sqliter: '0.6.1', - testhelp: '0.2.1', + testhelp: '0.1.2', paging: '2.0.0', ] diff --git a/gradle/gradle-mvn-mpp-push.gradle b/gradle/gradle-mvn-mpp-push.gradle index 2946654d7..9fc1d1d39 100644 --- a/gradle/gradle-mvn-mpp-push.gradle +++ b/gradle/gradle-mvn-mpp-push.gradle @@ -44,7 +44,8 @@ dokka { } def isReleaseBuild() { - return VERSION_NAME.contains("SNAPSHOT") == false + return false + //return VERSION_NAME.contains("SNAPSHOT") == false } def getReleaseRepositoryUrl() { @@ -122,6 +123,7 @@ publishing { } repositories { + mavenLocal() maven { url isReleaseBuild() ? getReleaseRepositoryUrl() : getSnapshotRepositoryUrl() credentials { diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle index 055abc185..866b8f3d2 100644 --- a/gradle/gradle-mvn-push.gradle +++ b/gradle/gradle-mvn-push.gradle @@ -21,7 +21,8 @@ version = VERSION_NAME group = GROUP def isReleaseBuild() { - return VERSION_NAME.contains("SNAPSHOT") == false + return false + //return VERSION_NAME.contains("SNAPSHOT") == false } def getReleaseRepositoryUrl() { diff --git a/settings.gradle b/settings.gradle index a1bd9841f..dd40c6a12 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,10 @@ rootProject.name = 'sqldelight' include ':drivers:android-driver' -include ':drivers:ios-driver' +include ':drivers:native-driver' include ':drivers:sqlite-driver' include ':drivers:driver-test' + include ':extensions:android-paging' include ':extensions:coroutines-extensions' include ':extensions:rxjava2-extensions' @@ -18,4 +19,4 @@ include ':sqlite-migrations' include ':test-util' enableFeaturePreview('GRADLE_METADATA') -enableFeaturePreview('STABLE_PUBLISHING') +enableFeaturePreview('STABLE_PUBLISHING') \ No newline at end of file diff --git a/sqldelight-gradle-plugin/src/test/fulfilled-table-variant/build.gradle b/sqldelight-gradle-plugin/src/test/fulfilled-table-variant/build.gradle index c637f1b5d..408780596 100644 --- a/sqldelight-gradle-plugin/src/test/fulfilled-table-variant/build.gradle +++ b/sqldelight-gradle-plugin/src/test/fulfilled-table-variant/build.gradle @@ -7,6 +7,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/integration-android-library/build.gradle b/sqldelight-gradle-plugin/src/test/integration-android-library/build.gradle index f53134eff..9c70cbf5d 100644 --- a/sqldelight-gradle-plugin/src/test/integration-android-library/build.gradle +++ b/sqldelight-gradle-plugin/src/test/integration-android-library/build.gradle @@ -23,6 +23,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/integration-android/build.gradle b/sqldelight-gradle-plugin/src/test/integration-android/build.gradle index fa7fd24e3..40e6e0e41 100644 --- a/sqldelight-gradle-plugin/src/test/integration-android/build.gradle +++ b/sqldelight-gradle-plugin/src/test/integration-android/build.gradle @@ -23,6 +23,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/integration-multiplatform/android-build.gradle b/sqldelight-gradle-plugin/src/test/integration-multiplatform/android-build.gradle index 511574c6a..09cfee5fd 100644 --- a/sqldelight-gradle-plugin/src/test/integration-multiplatform/android-build.gradle +++ b/sqldelight-gradle-plugin/src/test/integration-multiplatform/android-build.gradle @@ -7,6 +7,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/integration-multiplatform/ios-build.gradle b/sqldelight-gradle-plugin/src/test/integration-multiplatform/ios-build.gradle index d58e2ad74..ccf10b292 100644 --- a/sqldelight-gradle-plugin/src/test/integration-multiplatform/ios-build.gradle +++ b/sqldelight-gradle-plugin/src/test/integration-multiplatform/ios-build.gradle @@ -6,6 +6,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/integration/build.gradle b/sqldelight-gradle-plugin/src/test/integration/build.gradle index c020cf0e5..25b4f9024 100644 --- a/sqldelight-gradle-plugin/src/test/integration/build.gradle +++ b/sqldelight-gradle-plugin/src/test/integration/build.gradle @@ -6,6 +6,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/kotlin-mpp-1.3.20/build.gradle b/sqldelight-gradle-plugin/src/test/kotlin-mpp-1.3.20/build.gradle index e6130f787..f55b94b99 100644 --- a/sqldelight-gradle-plugin/src/test/kotlin-mpp-1.3.20/build.gradle +++ b/sqldelight-gradle-plugin/src/test/kotlin-mpp-1.3.20/build.gradle @@ -6,6 +6,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle b/sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle index 02e27d3b7..5fc576012 100644 --- a/sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle +++ b/sqldelight-gradle-plugin/src/test/kotlin-mpp/build.gradle @@ -6,6 +6,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/library-project/build.gradle b/sqldelight-gradle-plugin/src/test/library-project/build.gradle index b63950c8d..580ae2ded 100644 --- a/sqldelight-gradle-plugin/src/test/library-project/build.gradle +++ b/sqldelight-gradle-plugin/src/test/library-project/build.gradle @@ -7,6 +7,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/migration-failure/build.gradle b/sqldelight-gradle-plugin/src/test/migration-failure/build.gradle index 4525b1731..1999379a7 100644 --- a/sqldelight-gradle-plugin/src/test/migration-failure/build.gradle +++ b/sqldelight-gradle-plugin/src/test/migration-failure/build.gradle @@ -4,6 +4,7 @@ plugins { } repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/migration-success/build.gradle b/sqldelight-gradle-plugin/src/test/migration-success/build.gradle index 4525b1731..1999379a7 100644 --- a/sqldelight-gradle-plugin/src/test/migration-success/build.gradle +++ b/sqldelight-gradle-plugin/src/test/migration-success/build.gradle @@ -4,6 +4,7 @@ plugins { } repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/migration-syntax-failure/build.gradle b/sqldelight-gradle-plugin/src/test/migration-syntax-failure/build.gradle index 4525b1731..1999379a7 100644 --- a/sqldelight-gradle-plugin/src/test/migration-syntax-failure/build.gradle +++ b/sqldelight-gradle-plugin/src/test/migration-syntax-failure/build.gradle @@ -4,6 +4,7 @@ plugins { } repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/no-kotlin-android/build.gradle b/sqldelight-gradle-plugin/src/test/no-kotlin-android/build.gradle index 6160657f6..26791f23f 100644 --- a/sqldelight-gradle-plugin/src/test/no-kotlin-android/build.gradle +++ b/sqldelight-gradle-plugin/src/test/no-kotlin-android/build.gradle @@ -6,6 +6,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/no-kotlin/build.gradle b/sqldelight-gradle-plugin/src/test/no-kotlin/build.gradle index aa6e95bb3..2d6cc3fb9 100644 --- a/sqldelight-gradle-plugin/src/test/no-kotlin/build.gradle +++ b/sqldelight-gradle-plugin/src/test/no-kotlin/build.gradle @@ -3,6 +3,7 @@ plugins { } repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/properties-file/build.gradle b/sqldelight-gradle-plugin/src/test/properties-file/build.gradle index 4525b1731..1999379a7 100644 --- a/sqldelight-gradle-plugin/src/test/properties-file/build.gradle +++ b/sqldelight-gradle-plugin/src/test/properties-file/build.gradle @@ -4,6 +4,7 @@ plugins { } repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/schema-file-android/build.gradle b/sqldelight-gradle-plugin/src/test/schema-file-android/build.gradle index fd324c0ff..7caf650da 100644 --- a/sqldelight-gradle-plugin/src/test/schema-file-android/build.gradle +++ b/sqldelight-gradle-plugin/src/test/schema-file-android/build.gradle @@ -7,6 +7,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/schema-file-sqm/build.gradle b/sqldelight-gradle-plugin/src/test/schema-file-sqm/build.gradle index 72f858032..8bdfa9e06 100644 --- a/sqldelight-gradle-plugin/src/test/schema-file-sqm/build.gradle +++ b/sqldelight-gradle-plugin/src/test/schema-file-sqm/build.gradle @@ -4,6 +4,7 @@ plugins { } repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/schema-file/build.gradle b/sqldelight-gradle-plugin/src/test/schema-file/build.gradle index 72f858032..8bdfa9e06 100644 --- a/sqldelight-gradle-plugin/src/test/schema-file/build.gradle +++ b/sqldelight-gradle-plugin/src/test/schema-file/build.gradle @@ -4,6 +4,7 @@ plugins { } repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/variants/build.gradle b/sqldelight-gradle-plugin/src/test/variants/build.gradle index f25f1bf80..7c474a4b4 100644 --- a/sqldelight-gradle-plugin/src/test/variants/build.gradle +++ b/sqldelight-gradle-plugin/src/test/variants/build.gradle @@ -8,6 +8,7 @@ apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-gradle-plugin/src/test/working-variants/build.gradle b/sqldelight-gradle-plugin/src/test/working-variants/build.gradle index 6a5f106a7..7ed9e6e2d 100644 --- a/sqldelight-gradle-plugin/src/test/working-variants/build.gradle +++ b/sqldelight-gradle-plugin/src/test/working-variants/build.gradle @@ -7,6 +7,7 @@ plugins { apply from: '../../../../gradle/dependencies.gradle' repositories { + mavenLocal() maven { url "file://${projectDir.absolutePath}/../../../../build/localMaven" } diff --git a/sqldelight-runtime/build.gradle b/sqldelight-runtime/build.gradle index 2cd998a27..2d0b57646 100644 --- a/sqldelight-runtime/build.gradle +++ b/sqldelight-runtime/build.gradle @@ -59,9 +59,10 @@ kotlin { targetFromPreset(presets.iosX64, 'iosX64') targetFromPreset(presets.iosArm32, 'iosArm32') targetFromPreset(presets.iosArm64, 'iosArm64') + targetFromPreset(presets.mingwX64, 'mingw') } - configure([targets.iosX64, targets.iosArm32, targets.iosArm64]) { + configure([targets.iosX64, targets.iosArm32, targets.iosArm64, targets.mingw]) { compilations.main.source(sourceSets.nativeMain) } }