Upgrade dependencies

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
           distribution: 'oracle'
           java-version: ${{ env.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew assembleBot
       - name: Upload plugin artifact
         uses: actions/upload-artifact@v4
@@ -83,7 +83,7 @@ jobs:
           security import INSTALLER_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew packageReleaseDistributionForCurrentOS -Pcompose.desktop.mac.sign=true
         shell: bash
       - name: Package Linux Distribution
@@ -133,7 +133,7 @@ jobs:
           fileDir: 'keystore'
           encodedString: ${{ secrets.KEYSTORE }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - env:
           SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
@@ -254,7 +254,7 @@ jobs:
           ACTIONS_ALLOW_UNSECURE_COMMANDS: true
         id: tagName
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew :app:ios:podInstall :app:ios:linkPodReleaseFrameworkIosArm64
       - name: Deploy iOS Beta to TestFlight via Fastlane
         uses: maierj/[email protected]
@@ -317,6 +317,7 @@ jobs:
   sign_windows_binary:
     runs-on: windows-latest
     needs: [create_release, build_desktop_app]
+    if: false # waiting on signpath to enable this
     steps:
       - uses: actions/download-artifact@v4
         name: Download Artifacts from Windows
@@ -344,3 +345,4 @@ jobs:
         with:
           id: ${{ needs.create_release.outputs.release_id }}
           files: signed/Tonbrett.msix
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/maven.yml

@@ -19,7 +19,7 @@ jobs:
           distribution: 'temurin'
           java-version: 22
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew publish
         env:
           SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}

.github/workflows/winget.yml

@@ -11,6 +11,7 @@ on:
 
 jobs:
   winget:
+    if: false # Waiting for signpath
     name: Update winget manifest
     runs-on: windows-latest
     steps:

app/shared/build.gradle.kts

@@ -75,7 +75,7 @@ kotlin {
             }
         }
 
-        jvmMain {
+        named("desktopMain") {
             dependencies {
                 implementation(libs.kmongo.id.serialization)
                 implementation(libs.kotlinx.coroutines.swing)
@@ -101,7 +101,7 @@ kotlin {
 
 dependencies {
     kspCommonMainMetadata(libs.lyricist.processor)
-    "jvmMainImplementation"(libs.kord.common) {
+    "desktopMainImplementation"(libs.kord.common) {
         exclude(group = "io.ktor")
     }
 }

bot/build.gradle.kts

@@ -42,12 +42,12 @@ mikbotPlugin {
 }
 
 tasks {
-    assembleBot {
-        bundledPlugins = listOf(
-            "[email protected]",
-            "music-player@${libs.mikbot.music.get().version}"
-        )
-    }
+//    assembleBot {
+//        bundledPlugins = listOf(
+//            "[email protected]",
+//            "music-player@${libs.mikbot.music.get().version}"
+//        )
+//    }
 
     val buildWebApp = register<Copy>("buildWebApp") {
         val webApp = project(":app:web")

client/build.gradle.kts

@@ -41,7 +41,7 @@ kotlin {
             }
         }
 
-        jvmMain {
+        desktopMain {
             dependencies {
                 implementation(libs.ktor.client.okhttp)
             }

common/build.gradle.kts

@@ -21,7 +21,7 @@ kotlin {
             }
         }
 
-        jvmMain {
+        desktopMain {
             dependencies {
                 compileOnly(libs.kmongo.id.serialization)
                 compileOnly(libs.kord.common)

gradle.properties

@@ -6,8 +6,8 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 android.useAndroidX=true
 org.jetbrains.compose.experimental.uikit.enabled=true
-kotlin.native.ignoreIncorrectDependencies=true
 kotlin.native.ignoreDisabledTargets=true
+kotlin.suppressGradlePluginWarnings=IncorrectCompileOnlyDependencyWarning
 
 # https://docs.gradle.org/current/userguide/upgrading_version_8.html#xml_parsing_now_requires_recent_parsers
 systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl

gradle/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 ktor = "2.3.12"
 kmongo = "5.1.0"
 kord = "0.14.0"
-mikbot = "3.33.1"
-ksp = "2.0.0-1.0.22"
-kordex = "1.8.1-SNAPSHOT"
+mikbot = "3.35.4"
+ksp = "2.0.20-1.0.24"
+kordex = "1.9.0-SNAPSHOT"
 android = "8.5.0"
 compose = "1.6.11"
 compose-wear = "1.3.1"
@@ -15,7 +15,7 @@ coroutines = "1.8.1"
 play-services-wearable = "18.2.0"
 horologist = "0.6.14"
 protobuf = "4.27.2"
-coil = "3.0.0-alpha07"
+coil = "3.0.0-SNAPSHOT"
 
 [libraries]
 kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.1" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################