Merge pull request #25 from icerockdev/develop

Release 0.4.0
icerockdev · May 17, 2023 · a770aaa · a770aaa
2 parents 6ce28f4 + 10c8834
commit a770aaa
Show file tree

Hide file tree

Showing 20 changed files with 189 additions and 161 deletions.
diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml
@@ -12,15 +12,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Cocoapods install
       run: (cd sample/ios-app && pod install)
     - name: Check library
-      run: ./gradlew build publishToMavenLocal
+      run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
     - name: Install pods
       run: cd sample/ios-app && pod install
     - name: build ios sample
-      run: cd sample/ios-app && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty
+      run: cd sample/ios-app && set -o pipefail && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug -sdk iphonesimulator -arch x86_64 build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,10 +20,10 @@ jobs:
             SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
       steps:
         - uses: actions/checkout@v1
-        - name: Set up JDK 1.8
+        - name: Set up JDK 11
           uses: actions/setup-java@v1
           with:
-            java-version: 1.8
+            java-version: 11
         - name: Cocoapods install
           run: (cd sample/ios-app && pod install)
         - name: Publish library

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ![moko-socket-io](https://user-images.githubusercontent.com/5010169/80988267-712b7e80-8e5d-11ea-955e-c788a567c64e.png)  
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/socket-io) ](https://repo1.maven.org/maven2/dev/icerock/moko/socket-io)![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=socket-io)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://img.shields.io/maven-central/v/dev.icerock.moko/socket-io) ](https://repo1.maven.org/maven2/dev/icerock/moko/socket-io) ![kotlin-version](https://kotlin-version.aws.icerock.dev/kotlin-version?group=dev.icerock.moko&name=socket-io)
 
 # Mobile Kotlin socket io
 This is a Kotlin MultiPlatform library that provides real-time, event-based communication for iOS and Android.
@@ -36,8 +36,7 @@ allprojects {
 ### project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:socket-io:0.3.0")
-    commonMainApi("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1")
+    commonMainApi("dev.icerock.moko:socket-io:0.4.0")
 }
 ```
 
@@ -60,7 +59,7 @@ kotlin {
         // add native dependency
         pod(name = "mokoSocketIo") {
             source = git(url = "https://github.com/icerockdev/moko-socket-io.git") {
-                tag = "release/0.3.0"
+                tag = "release/0.4.0"
             }
         }
     }
@@ -85,7 +84,7 @@ cocoaPods {
 
 Podfile
 ```ruby
-pod 'mokoSocketIo', :git => 'https://github.com/icerockdev/moko-socket-io.git', :tag => 'release/0.3.0'
+pod 'mokoSocketIo', :git => 'https://github.com/icerockdev/moko-socket-io.git', :tag => 'release/0.4.0'
 ```
 
 ## Usage

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,9 +11,9 @@ buildscript {
     }
     dependencies {
         classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
-        classpath("dev.icerock:mobile-multiplatform:0.12.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
-        classpath("com.android.tools.build:gradle:4.2.1")
+        classpath("dev.icerock:mobile-multiplatform:0.14.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+        classpath("com.android.tools.build:gradle:7.4.2")
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,10 +3,8 @@ org.gradle.configureondemand=false
 org.gradle.parallel=true
 
 kotlin.code.style=official
-kotlin.native.enableDependencyPropagation=false
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.mpp.enableCompatibilityMetadataVariant=true
+kotlin.mpp.enableCInteropCommonization=true
 
 mobile.multiplatform.podsProject=sample/ios-app/Pods/Pods.xcodeproj
 
-android.useAndroidX=true
+android.useAndroidX=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 detektVersion = "1.15.0"
 androidAppCompatVersion = "1.2.0"
 androidSocketIoVersion = "1.0.0"
-kotlinxSerializationVersion = "1.2.1"
-mokoSocketIoVersion = "0.3.0"
+kotlinxSerializationVersion = "1.3.3"
+mokoSocketIoVersion = "0.4.0"
 compileSdk = "28"
 targetSdk = "28"
 minSdk = "16"

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 @@
+#Wed May 17 12:41:59 AZT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists