Merge pull request #107 from touchlab/hbmartin-hm/mem-pool-fix-and-kotlin-upgrade

Hbmartin hm/mem pool fix and kotlin upgrade

Author: kpgalligan

.github/workflows/build.yml

@@ -12,43 +12,51 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ macOS-latest, ubuntu-18.04 ]
+        os: [ macOS-latest ]
+#        os: [ macOS-latest, ubuntu-18.04 ] GitHub actions removed ubuntu-18.04
 #        os: [ macOS-latest, windows-latest, ubuntu-18.04 ]
     runs-on: ${{matrix.os}}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v2
+
       - name: Install msys2
         if: matrix.os == 'windows-latest'
         uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           update: true
           install: git mingw-w64-x86_64-toolchain libsqlite
+
       - 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: Update Environment Variables
+        if: matrix.os == 'windows-latest'
         shell: bash
         run: |
           echo "c:\msys64\mingw64\bin" >> $GITHUB_PATH
+
       - name: Build
         run: ./gradlew build --no-daemon --stacktrace
 
-      - name: Build New Memory Model
+      - name: Build Old Memory Model
         run: ./gradlew build --no-daemon --stacktrace -Pkotlin.native.binary.memoryModel=experimental
 env:
   GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"

.idea/icon.svg

@@ -3,7 +3,6 @@ allprojects {
         mavenLocal()
         mavenCentral()
         google()
-        jcenter()
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
     }
 }

build.gradle.kts

@@ -2,8 +2,8 @@ kotlin.code.style=official
 
 GROUP=co.touchlab
 
-VERSION_NAME=1.2.3
-KOTLIN_VERSION=1.8.10
+VERSION_NAME=1.3.0
+KOTLIN_VERSION=1.9.20
 
 kotlin.native.ignoreDisabledTargets=true
 
@@ -26,3 +26,4 @@ POM_DEVELOPER_URL=https://touchlab.co/
 
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.commonizerLogLevel=info
+kotlin.mpp.applyDefaultHierarchyTemplate=false

gradle.properties

@@ -27,10 +27,10 @@ def getRepositoryPassword() {
 }
 
 task emptySourcesJar(type: Jar) {
-  classifier = 'sources'
+  archiveClassifier = 'sources'
 }
 task emptyJavadocJar(type: Jar) {
-  classifier = 'javadoc'
+  archiveClassifier = 'javadoc'
 }
 
 def getGpgKey() {
@@ -97,7 +97,6 @@ publishing {
 }
 
 tasks.register('publishWindows') {
-  dependsOn 'publishMingwX86PublicationToMavenRepository'
   dependsOn 'publishMingwX64PublicationToMavenRepository'
 }
 

gradle/gradle-mvn-mpp-push.gradle

@@ -1,6 +1,5 @@
-#Sat Oct 27 17:06:01 BST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip