Update toolchain, bump version

pearxteam · Apr 24, 2023 · 76a183f · 76a183f
1 parent 6a0ee68
commit 76a183f
Show file tree

Hide file tree

Showing 12 changed files with 244 additions and 176 deletions.
diff --git a/.github/workflows/check_only.yml b/.github/workflows/check_only.yml
@@ -13,6 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle
@@ -30,6 +34,10 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle
@@ -47,6 +55,10 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -10,6 +10,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle
@@ -32,6 +36,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle
@@ -55,6 +63,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -10,6 +10,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle
@@ -32,6 +36,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle
@@ -55,6 +63,10 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
       - uses: actions/cache@v1
         with:
           path: ~/.gradle

diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ run
 node_modules
 package-lock.json
 out
-local.properties
+local.properties
+kotlin-js-store
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,13 +4,15 @@ import net.pearx.multigradle.util.MultiGradleExtension
 val projectChangelog: String by project
 val projectDescription: String by project
 
-val pearxRepoUsername: String? by project
-val pearxRepoPassword: String? by project
 val sonatypeOssUsername: String? by project
 val sonatypeOssPassword: String? by project
 val githubAccessToken: String? by project
 val devBuildNumber: String? by project
 
+
+description = projectDescription
+
+
 plugins {
     id("net.pearx.multigradle.simple.project")
     id("org.jetbrains.kotlin.multiplatform") apply (false)
@@ -19,9 +21,6 @@ plugins {
     signing
 }
 
-group = "net.pearx.kasechange"
-description = projectDescription
-
 configure<MultiGradleExtension> {
     if (devBuildNumber != null) {
         projectVersion = "$projectVersion-dev-$devBuildNumber"
@@ -66,29 +65,9 @@ configure<PublishingExtension> {
                 system.set("GitHub")
                 url.set("https://github.com/pearxteam/kasechange/issues")
             }
-            ciManagement {
-                system.set("Jenkins")
-                url.set("https://ci.pearx.net/job/pearxteam/job/kasechange")
-            }
         }
     }
     repositories {
-        maven {
-            credentials {
-                username = pearxRepoUsername
-                password = pearxRepoPassword
-            }
-            name = "pearx-repo-develop"
-            url = uri("https://repo.pearx.net/maven2/develop/")
-        }
-        maven {
-            credentials {
-                username = pearxRepoUsername
-                password = pearxRepoPassword
-            }
-            name = "pearx-repo-release"
-            url = uri("https://repo.pearx.net/maven2/release/")
-        }
         maven {
             credentials {
                 username = sonatypeOssUsername

diff --git a/gradle.properties b/gradle.properties
@@ -1,27 +1,31 @@
+group=net.pearx.kasechange
+
+kotlin.mpp.androidSourceSetLayoutVersion=2
+
 org.gradle.jvmargs=-Xmx1G
 # https://github.com/gradle/gradle/issues/11308
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 #Common Stuff
-projectVersion=1.3.0
-projectChangelog=Add support for Kotlin/Native and Android
+projectVersion=1.4.0
+projectChangelog=Add sentence case format, update dependencies
 projectDescription=Multiplatform Kotlin library to convert strings between various case formats including Camel Case, Snake Case, Pascal Case and Kebab Case
-kotlinVersion=1.3.72
-githubReleaseVersion=2.2.12
-multigradleVersion=1.8.3
+kotlinVersion=1.8.20
+githubReleaseVersion=2.4.1
+multigradleVersion=1.12.1
 
 #JS Stuff
-nodeJsVersion=14.2.0
-npmVersion=6.14.5
-mochaVersion=7.1.2
-mochaJunitReporterVersion=0.4.3
+nodeJsVersion=20.0.0
+npmVersion=9.6.5
+mochaVersion=10.2.0
+mochaJunitReporterVersion=2.2.0
 
 #Java Stuff
 javaVersion=8
-junitJupiterVersion=5.6.2
-jacocoVersion=0.8.5
+junitJupiterVersion=5.9.2
+jacocoVersion=0.8.9
 
 #Android Stuff
-buildToolsVersion=29.0.3
-compileSdkVersion=android-29
-junitVersion=4.13
+buildToolsVersion=30.0.3
+compileSdkVersion=android-33
+junitVersion=4.13.2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists