version update to kotlin 1.9.0

danbrough · Aug 3, 2023 · 47fe420 · 47fe420
1 parent 766155d
commit 47fe420
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 18 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
 }
 
 
-val javaLangVersion = 11
+val javaLangVersion = 8
 
 java {
  toolchain.languageVersion.set(JavaLanguageVersion.of(javaLangVersion))

diff --git a/buildSrc/src/main/kotlin/Xtras.kt b/buildSrc/src/main/kotlin/Xtras.kt
@@ -3,10 +3,10 @@ import org.gradle.plugin.use.PluginDependencySpec
 
 object Xtras {
  const val projectGroup = "org.danbrough.kotlinxtras"
- const val version = "0.0.3-beta17"
- const val publishingVersion = "0.0.3-beta17"
+ const val version = "0.0.3-beta15"
+ const val publishingVersion = "0.0.3-beta15"
  const val repoName = "xtras"
- const val javaLangVersion = 11
+ const val javaLangVersion = 8
 }
 
 fun PluginDependenciesSpec.xtras(plugin: String): PluginDependencySpec =

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -11,6 +11,11 @@ dependencies {
  implementation("org.danbrough.kotlinxtras:plugin:${Xtras.version}")
 }
 
+repositories {
+ maven("https://repo.maven.apache.org/maven2/")
+
+ mavenCentral()
+}
 
 gradlePlugin {
  plugins {

diff --git a/core/src/main/kotlin/org/danbrough/kotlinxtras/core/curl.kt b/core/src/main/kotlin/org/danbrough/kotlinxtras/core/curl.kt
@@ -24,10 +24,11 @@ fun Project.enableCurl(
  publishingGroup = CORE_PUBLISHING_PACKAGE
 
 
- version = "8.0.1"
+ version = "8.2.1"
 
  //git("https://github.com/curl/curl.git", "046209e561b7e9b5aab1aef7daebf29ee6e6e8c7")
- git("https://github.com/curl/curl.git", "b16d1fa8ee567b52c09a0f89940b07d8491b881d")
+ //git("https://github.com/curl/curl.git", "b16d1fa8ee567b52c09a0f89940b07d8491b881d")
+ git("https://github.com/curl/curl.git", "a9f8fe28481fef7c28d85b4a12a3a35521408eaf")
 
  val autoConfTaskName: KonanTarget.() -> String =
  { "xtrasAutoconf${libName.capitalized()}${platformName.capitalized()}" }

diff --git a/gradle.properties b/gradle.properties
@@ -25,5 +25,5 @@ xtras.dir.packages=/usr/local/kotlinxtras/packages
 # otherwise everything is included
 #Print xtras log statements to stdout as well as the gradle log
 xtras.log.stdout=true
-sonatypeRepoId=orgdanbrough-1488
+sonatypeRepoId=orgdanbrough-1489
 bootstrap=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.1.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.3-rc-3-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -8,6 +8,8 @@ plugins {
 
 
 repositories {
+ maven("https://repo.maven.apache.org/maven2/")
+
  mavenCentral()
 }
 

diff --git a/repos/curl b/repos/curl
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,9 +2,13 @@ pluginManagement {
  repositories {
 
  maven(file("build/xtras/maven"))
+ //mavenCentral()
+ maven("https://repo1.maven.org/maven2")
+ mavenCentral()
+ maven("https://repo.maven.apache.org/maven2/")
  maven("https://s01.oss.sonatype.org/content/groups/staging")
  gradlePluginPortal()
- mavenCentral()
+
  google()
  }
 }

diff --git a/versions.properties b/versions.properties
@@ -6,12 +6,9 @@
 ####
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
-
 ## unused
 version.org.danbrough..klog=0.0.2-beta02
+version.org.jetbrains.dokka..dokka-gradle-plugin=1.8.20
+version.kotlin=1.9.0
+plugin.org.jetbrains.dokka=1.8.20
 
-version.org.jetbrains.dokka..dokka-gradle-plugin=1.8.10
-
-version.kotlin=1.8.20
-
-plugin.org.jetbrains.dokka=1.8.10
diff --git a/xtras/build.gradle.kts b/xtras/build.gradle.kts
@@ -2,7 +2,7 @@ import org.danbrough.kotlinxtras.core.enableCurl
 import org.danbrough.kotlinxtras.core.enableIconv
 import org.danbrough.kotlinxtras.core.enableOpenssl
 import org.danbrough.kotlinxtras.core.enableOpenssl3
-import org.danbrough.kotlinxtras.core.enableSqliteOld
+import org.danbrough.kotlinxtras.core.enableSqlite
 
 plugins {
  // `kotlin-dsl`
@@ -25,7 +25,7 @@ enableOpenssl3 {
 enableCurl {
 }
 
-enableSqliteOld {
+enableSqlite {
 }
 /*
 gradlePlugin {