merged dev from 0.0.3-beta14

danbrough · Mar 16, 2023 · 9596bd4 · 9596bd4
2 parents 2b628cf + 6925f1c
commit 9596bd4
Show file tree

Hide file tree

Showing 37 changed files with 201 additions and 220 deletions.
diff --git a/buildSrc/src/main/kotlin/Xtras.kt b/buildSrc/src/main/kotlin/Xtras.kt
@@ -3,8 +3,8 @@ import org.gradle.plugin.use.PluginDependencySpec
 
 object Xtras {
  const val projectGroup = "org.danbrough.kotlinxtras"
- const val version = "0.0.3-beta12"
- const val publishingVersion = "0.0.3-beta12"
+ const val version = "0.0.3-beta14"
+ const val publishingVersion = "0.0.3-beta14"
  const val repoName = "xtras"
  const val javaLangVersion = 11
 }

diff --git a/core/src/main/kotlin/org/danbrough/kotlinxtras/core/openssl3.kt b/core/src/main/kotlin/org/danbrough/kotlinxtras/core/openssl3.kt
@@ -10,7 +10,9 @@ import org.jetbrains.kotlin.konan.target.Family
 
 const val OPENSSL3_EXTN_NAME = "openssl3"
 
-const val OPENSSL3_VERSION = "3.0.8-danbrough"
+//const val OPENSSL3_VERSION = "3.1.0-danbrough"
+//const val OPENSSL3_GIT_COMMIT = "90078132a7e0b3536127cff05f6b3de71a2f7898"
+const val OPENSSL3_VERSION = "3.0.8"
 const val OPENSSL3_GIT_COMMIT = "e4e4c3b72620cf8ef35c275271415bfc675ffaa3"
 
 fun Project.enableOpenssl3(
@@ -40,8 +42,14 @@ fun Project.enableOpenssl3(
  }
 
 
- build {
+ build { target ->
  commandLine(binaries.makeBinary, "install_sw")
+ doLast {
+ val buildDir = buildDir(target)
+ if (buildDir.resolve("lib64").exists()) {
+ buildDir.resolve("lib64").renameTo(buildDir.resolve("lib"))
+ }
+ }
  }
 
  cinterops {

diff --git a/core/src/main/kotlin/org/danbrough/kotlinxtras/core/sqlite.kt b/core/src/main/kotlin/org/danbrough/kotlinxtras/core/sqlite.kt
@@ -8,8 +8,8 @@ import org.danbrough.kotlinxtras.hostTriplet
 import org.gradle.api.Project
 
 const val XTRAS_SQLITE_EXTN_NAME = "sqlite"
-const val XTRAS_SQLITE_VERSION_NAME = "3.41.0"
-const val XTRAS_SQLITE_SOURCE_URL = "https://www.sqlite.org/2023/sqlite-autoconf-3410000.tar.gz"
+const val XTRAS_SQLITE_VERSION_NAME = "3.41.1"
+const val XTRAS_SQLITE_SOURCE_URL = "https://www.sqlite.org/2023/sqlite-autoconf-3410100.tar.gz"
 
 fun Project.enableSqlite(
  extnName: String = XTRAS_SQLITE_EXTN_NAME, versionName: String = XTRAS_SQLITE_VERSION_NAME,

diff --git a/demos/curl/versions.properties b/demos/curl/versions.properties
@@ -7,7 +7,7 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 
-plugin.org.danbrough.kotlinxtras.core=0.0.3-beta12
+plugin.org.danbrough.kotlinxtras.core=0.0.3-beta14
 
 version.kotlin=1.8.10
 ## # available=1.8.20-Beta

diff --git a/demos/iconv/versions.properties b/demos/iconv/versions.properties
@@ -6,17 +6,9 @@
 ####
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
-
-plugin.org.danbrough.kotlinxtras.core=0.0.3-beta11
-
+plugin.org.danbrough.kotlinxtras.core=0.0.3-beta14
 version.kotlin=1.8.10
 ## # available=1.8.20-Beta
-
-
-
 version.org.danbrough..klog=0.0.2-beta02
-
-
 version.org.danbrough.kotlinx..kotlinx-coroutines-core=1.6.4
-
 version.org.danbrough.kotlinxtras..common=0.0.1-beta01
diff --git a/demos/repos/datetime/versions.properties b/demos/repos/datetime/versions.properties
@@ -8,9 +8,3 @@
 #### suppress inspection "UnusedProperty" for whole file
 
 version.kotlin=1.8.10
-## # available=1.7.21
-## # available=1.7.22
-## # available=1.8.0-Beta
-## # available=1.8.0-RC
-## # available=1.8.0-RC2
-## # available=1.8.0
diff --git a/demos/repos/ktor/build.gradle.kts b/demos/repos/ktor/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.danbrough.kotlinxtras.enableCurl
+import org.danbrough.kotlinxtras.core.enableCurl
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 
@@ -9,6 +9,7 @@ plugins {
 
 
 enableCurl {
+
 }
 
 repositories {
@@ -23,9 +24,7 @@ kotlin {
  linuxX64()
  linuxArm64()
  linuxArm32Hfp()
- // uncomment if you want them
- //macosX64()
- //macosArm64()
+
 
  /** //uncomment if you want android support
  androidNativeX86()

diff --git a/demos/repos/ktor/settings.gradle.kts b/demos/repos/ktor/settings.gradle.kts
@@ -15,5 +15,5 @@ plugins {
 
 
 
-rootProject.name = "ktor_standalone_demo"
+rootProject.name = "ktor_demo"
 
diff --git a/demos/repos/ktor/versions.properties b/demos/repos/ktor/versions.properties
@@ -7,15 +7,17 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 
-plugin.org.danbrough.kotlinxtras.core=0.0.3-beta07
+plugin.org.danbrough.kotlinxtras.core=0.0.3-beta14
 
 
 
-version.kotlin=1.8.0
+version.kotlin=1.8.10
+## # available=1.8.20-Beta
+## # available=1.8.20-RC
 
-version.org.danbrough.ktor..ktor-server-cio=2.2.2
+version.org.danbrough.ktor..ktor-server-cio=2.2.4
 
-version.org.danbrough.ktor..ktor-client-curl=2.2.2
+version.org.danbrough.ktor..ktor-client-curl=2.2.4
 
 
 version.org.danbrough.kotlinx..kotlinx-datetime=0.4.0d

diff --git a/demos/repos/okio/build.gradle.kts b/demos/repos/okio/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
  kotlin("multiplatform")
- // id("org.danbrough.kotlinxtras.consumer")
+  // id("org.danbrough.kotlinxtras.consumer")
 }
 
 
@@ -25,7 +25,7 @@ kotlin {
  linuxArm32Hfp()
  androidNativeX86()
 
- if (org.jetbrains.kotlin.konan.target.HostManager.Companion.hostIsMac){
+ if (org.jetbrains.kotlin.konan.target.HostManager.Companion.hostIsMac) {
  macosX64()
  macosArm64()
  }
@@ -43,9 +43,9 @@ kotlin {
 
  val commonMain by sourceSets.getting {
  dependencies {
- implementation(libs.klog)
- implementation(libs.okio)
- implementation(libs.okio.fakefilesystem)
+ implementation("org.danbrough:klog:_")
+ implementation("org.danbrough.okio:okio:_")
+ implementation("org.danbrough.okio:okio-fakefilesystem:_")
 
  }
  }

diff --git a/demos/repos/okio/gradle/libs.versions.toml b/demos/repos/okio/gradle/libs.versions.toml
diff --git a/demos/repos/okio/versions.properties b/demos/repos/okio/versions.properties
@@ -6,7 +6,9 @@
 ####
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
-
-
-
-version.kotlin=1.7.21
+version.kotlin=1.8.10
+## # available=1.8.20-Beta
+## # available=1.8.20-RC
+version.org.danbrough.okio..okio-fakefilesystem=3.3.0-alpha01
+version.org.danbrough.okio..okio=3.3.0-alpha01
+version.org.danbrough..klog=0.0.2-beta02
diff --git a/demos/repos/sqldelight/build.gradle.kts b/demos/repos/sqldelight/build.gradle.kts
@@ -1,13 +1,17 @@
-import org.danbrough.kotlinxtras.binaries.CurrentVersions.enableSqlite
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
-import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
+import org.danbrough.kotlinxtras.core.enableSqlite
 
 plugins {
  kotlin("multiplatform")
- id("org.danbrough.kotlinxtras.consumer")
+ id("org.danbrough.kotlinxtras.core")
  id("org.danbrough.sqldelight")
 }
 
+
+enableSqlite {}
+
+
+
 repositories {
  maven("/usr/local/kotlinxtras/build/m2")
  maven("https://s01.oss.sonatype.org/content/groups/staging/")
@@ -18,11 +22,6 @@ repositories {
  mavenCentral()
 }
 
-binaries {
- enableSqlite()
-}
-
-
 sqldelight {
  database("Database") {
  packageName = "demo"
@@ -38,17 +37,17 @@ kotlin {
 
  val commonMain by sourceSets.getting {
  dependencies {
- implementation(libs.sqlite)
- implementation(libs.primitive.adapters)
- implementation(libs.org.danbrough.sqldelight.runtime)
+ implementation("org.danbrough.kotlinxtras:sqlite:_")
+ implementation("org.danbrough.sqldelight:primitive-adapters:_")
+ implementation("org.danbrough.sqldelight:runtime:_")
  }
  }
 
 
  val nativeMain by sourceSets.creating {
  dependencies {
  dependsOn(commonMain)
- implementation(libs.native.driver)
+ implementation("org.danbrough.sqldelight:native-driver:_")
  }
  }
 
@@ -67,5 +66,3 @@ kotlin {
 
 }
 
-
-
diff --git a/demos/repos/sqldelight/gradle/libs.versions.toml b/demos/repos/sqldelight/gradle/libs.versions.toml
diff --git a/demos/repos/sqldelight/settings.gradle.kts b/demos/repos/sqldelight/settings.gradle.kts
@@ -2,7 +2,7 @@ pluginManagement {
 
  repositories {
  maven("/usr/local/kotlinxtras/build/m2")
- maven("https://s01.oss.sonatype.org/content/groups/staging/")
+  maven("https://s01.oss.sonatype.org/content/groups/staging/")
  maven("https://www.jetbrains.com/intellij-repository/releases")
  maven("https://cache-redirector.jetbrains.com/intellij-dependencies")
  gradlePluginPortal()

diff --git a/demos/repos/sqldelight/versions.properties b/demos/repos/sqldelight/versions.properties
@@ -6,12 +6,16 @@
 ####
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
-
-plugin.org.danbrough.kotlinxtras.consumer=0.0.2
-
-
-
-
+#### plugin.org.danbrough.kotlinxtras.consumer=0.0.2
+plugin.org.danbrough.kotlinxtras.core=0.0.3-beta14
 plugin.org.danbrough.sqldelight=2.0.0-alpha04
-
-version.kotlin=1.7.20
+version.kotlin=1.8.10
+## # available=1.8.20-Beta
+## # available=1.8.20-RC
+## unused
+version.org.danbrough.sqldelight..sqlite-3-18-dialect=2.0.0-alpha04
+version.org.danbrough.sqldelight..runtime=2.0.0-alpha04
+version.org.danbrough.sqldelight..primitive-adapters=2.0.0-alpha04
+version.org.danbrough.sqldelight..native-driver=2.0.0-alpha04
+version.org.danbrough.kotlinxtras..sqlite=3.39.4a
+## # available=3.39.4
diff --git a/demos/repos/sqliter/build.gradle.kts b/demos/repos/sqliter/build.gradle.kts
@@ -1,20 +1,18 @@
-import org.danbrough.kotlinxtras.binaries.CurrentVersions.enableSqlite
+import org.danbrough.kotlinxtras.core.enableSqlite
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
  kotlin("multiplatform")
- id("org.danbrough.kotlinxtras.consumer")
-}
-
-binaries {
- enableSqlite()
+ id("org.danbrough.kotlinxtras.core")
 }
 
 repositories {
  maven("https://s01.oss.sonatype.org/content/groups/staging/")
  mavenCentral()
 }
 
+enableSqlite()
+
 
 kotlin {
 
@@ -30,10 +28,9 @@ kotlin {
 
  val commonMain by sourceSets.getting {
  dependencies {
- implementation(libs.klog)
- implementation(libs.kotlinx.coroutines.core)
- implementation(libs.sqliter.driver)
- implementation(libs.sqlite)
+ implementation("org.danbrough:klog:_")
+ implementation("org.danbrough.kotlinx:kotlinx-coroutines-core:_")
+ implementation("org.danbrough.sqldelight:native-driver:_")
  }
  }