Update targets and kotlin

Author: kpgalligan

.github/workflows/build.yml

@@ -1,53 +1,62 @@
 name: deploy
 on: workflow_dispatch
-#on:
-#  pull_request:
-#    branches:
-#      - main
-#  push:
-#    branches:
-#      - main
 
 jobs:
-  build:
-    strategy:
-      matrix:
-        os: [macOS-11, ubuntu-latest]
-    runs-on: ${{matrix.os}}
+  deploy:
+    runs-on: macos-latest
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v2
+        with:
+          distribution: "adopt"
+          java-version: "17"
+
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
+
       - name: Cache gradle
         uses: actions/cache@v2
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+
       - name: Cache konan
         uses: actions/cache@v2
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      - name: Publish Mac/Windows Artifacts
-        if: matrix.os == 'macOS-11'
-        run: ./gradlew publish --no-daemon --stacktrace
-        env:
-          ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
 
-      - name: Publish Linux Artifacts
-        if: matrix.os == 'ubuntu-latest'
-        run: ./gradlew publishLinux --no-daemon --stacktrace
+      - name: Publish Artifacts
+        run: ./gradlew publish --no-daemon --stacktrace --no-build-cache
         env:
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
           ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
+
+      - uses: touchlab/read-property@main
+        id: version_name
+        with:
+          file: ./gradle.properties
+          property: VERSION_NAME
+
+      - name: Print versionBasePropertyValue
+        id: output
+        run: echo "${{ steps.version_name.outputs.propVal }}"
+
+      - name: Create Release
+        if: ${{ contains(steps.version_name.outputs.propVal, 'SNAPSHOT') == false }}
+        uses: touchlab/[email protected]
+        with:
+          tag: ${{ steps.version_name.outputs.propVal }}
 
 env:
   GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"

.github/workflows/deploy.yml

@@ -3,6 +3,12 @@ import org.jetbrains.kotlin.konan.target.Family.ANDROID
 import org.jetbrains.kotlin.konan.target.Family.LINUX
 import org.jetbrains.kotlin.konan.target.Family.MINGW
 
+buildscript {
+    dependencies {
+        classpath("com.vanniktech:gradle-maven-publish-plugin:0.23.1")
+    }
+}
+
 plugins {
     kotlin("multiplatform")
 }
@@ -25,18 +31,13 @@ kotlin {
     macosX64()
     iosX64()
     iosArm64()
-    iosArm32()
     watchosArm32()
     watchosArm64()
-    watchosX86()
     watchosX64()
     tvosArm64()
     tvosX64()
     mingwX64()
-    mingwX86()
     linuxX64()
-    linuxArm32Hfp()
-    linuxMips32()
 
     macosArm64()
     iosSimulatorArm64()
@@ -123,35 +124,6 @@ kotlin {
     }
 }
 
-/* Setup Publications */
-
-/*if (!HostManager.hostIsLinux) {
-    tasks.findByName("linuxX64Test")?.enabled = false
-    tasks.findByName("linkDebugTestLinuxX64")?.enabled = false
-    tasks.findByName("publishLinuxX64PublicationToMavenRepository")?.enabled = false
-}*/
-
-apply(from = "gradle/gradle-mvn-mpp-push.gradle")
-
-/*
-tasks.register("publishMac") {
-    setDependsOn(tasks.filter { t ->
-        t.name.startsWith("publish") && t.name.endsWith("ToMavenRepository") && !t.name.contains(
-            "Linux"
-        )
-    }.map { it.name })
-}
-*/
-
-tasks.register("publishWindows") {
-    if (project.tasks.findByName("publish") != null) {
-        setDependsOn(listOf(
-            "publishMingwX86PublicationToMavenRepository",
-            "publishMingwX64PublicationToMavenRepository"
-        ))
-    }
-}
-
 tasks.register("publishLinux") {
     if (project.tasks.findByName("publish") != null) {
         setDependsOn(listOf(
@@ -160,9 +132,4 @@ tasks.register("publishLinux") {
     }
 }
 
-/*
-tasks.register('publishLinux') {
-    if(project.tasks.findByName('publish')) {
-        dependsOn 'publishLinuxMips32PublicationToMavenRepository'
-    }
-}*/
+apply(plugin = "com.vanniktech.maven.publish")

build.gradle.kts

@@ -15,15 +15,18 @@
 #
 kotlin.code.style=official
 GROUP=co.touchlab
-VERSION_NAME=0.6.5
-KOTLIN_VERSION=1.8.10
-POM_URL=https://github.com/touchlab/TestHelp
-POM_DESCRIPTION=Kotlin Multiplatform Test Help
-POM_NAME=KMP Test Help
+VERSION_NAME=0.6.6
+KOTLIN_VERSION=1.9.10
+
 POM_ARTIFACT_ID=testhelp
+
+POM_NAME=KMP Test Help
+POM_DESCRIPTION=Kotlin Multiplatform Test Help
+POM_URL=https://github.com/touchlab/TestHelp
 POM_SCM_URL=https://github.com/touchlab/TestHelp
 POM_SCM_CONNECTION=scm:git:git://github.com/touchlab/TestHelp.git
 POM_SCM_DEV_CONNECTION=scm:git:git://github.com/touchlab/TestHelp.git
+
 POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
@@ -33,8 +36,4 @@ POM_DEVELOPER_NAME=Kevin Galligan
 POM_DEVELOPER_ORG=Kevin Galligan
 POM_DEVELOPER_URL=https://touchlab.co/
 
-kotlin.js.compiler=both
-
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.commonizerLogLevel=info
+kotlin.js.ir.output.granularity=whole-program

gradle.properties

@@ -16,6 +16,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists