Skip to content

Commit a770aaa

Browse files
authored
Merge pull request #25 from icerockdev/develop
Release 0.4.0
2 parents 6ce28f4 + 10c8834 commit a770aaa

File tree

20 files changed

+189
-161
lines changed

20 files changed

+189
-161
lines changed

.github/workflows/compilation-check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v1
15-
- name: Set up JDK 1.8
15+
- name: Set up JDK 11
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 1.8
18+
java-version: 11
1919
- name: Cocoapods install
2020
run: (cd sample/ios-app && pod install)
2121
- name: Check library
22-
run: ./gradlew build publishToMavenLocal
22+
run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
2323
- name: Install pods
2424
run: cd sample/ios-app && pod install
2525
- name: build ios sample
26-
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
26+
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

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
2121
steps:
2222
- uses: actions/checkout@v1
23-
- name: Set up JDK 1.8
23+
- name: Set up JDK 11
2424
uses: actions/setup-java@v1
2525
with:
26-
java-version: 1.8
26+
java-version: 11
2727
- name: Cocoapods install
2828
run: (cd sample/ios-app && pod install)
2929
- name: Publish library

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
![moko-socket-io](https://user-images.githubusercontent.com/5010169/80988267-712b7e80-8e5d-11ea-955e-c788a567c64e.png)
2-
[![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)
2+
[![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)
33

44
# Mobile Kotlin socket io
55
This is a Kotlin MultiPlatform library that provides real-time, event-based communication for iOS and Android.
@@ -36,8 +36,7 @@ allprojects {
3636
### project build.gradle
3737
```groovy
3838
dependencies {
39-
commonMainApi("dev.icerock.moko:socket-io:0.3.0")
40-
commonMainApi("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1")
39+
commonMainApi("dev.icerock.moko:socket-io:0.4.0")
4140
}
4241
```
4342

@@ -60,7 +59,7 @@ kotlin {
6059
// add native dependency
6160
pod(name = "mokoSocketIo") {
6261
source = git(url = "https://github.com/icerockdev/moko-socket-io.git") {
63-
tag = "release/0.3.0"
62+
tag = "release/0.4.0"
6463
}
6564
}
6665
}
@@ -85,7 +84,7 @@ cocoaPods {
8584

8685
Podfile
8786
```ruby
88-
pod 'mokoSocketIo', :git => 'https://github.com/icerockdev/moko-socket-io.git', :tag => 'release/0.3.0'
87+
pod 'mokoSocketIo', :git => 'https://github.com/icerockdev/moko-socket-io.git', :tag => 'release/0.4.0'
8988
```
9089

9190
## Usage

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ buildscript {
1111
}
1212
dependencies {
1313
classpath("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
14-
classpath("dev.icerock:mobile-multiplatform:0.12.0")
15-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
16-
classpath("com.android.tools.build:gradle:4.2.1")
14+
classpath("dev.icerock:mobile-multiplatform:0.14.2")
15+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
16+
classpath("com.android.tools.build:gradle:7.4.2")
1717
}
1818
}
1919

gradle.properties

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ org.gradle.configureondemand=false
33
org.gradle.parallel=true
44

55
kotlin.code.style=official
6-
kotlin.native.enableDependencyPropagation=false
7-
kotlin.mpp.enableGranularSourceSetsMetadata=true
8-
kotlin.mpp.enableCompatibilityMetadataVariant=true
6+
kotlin.mpp.enableCInteropCommonization=true
97

108
mobile.multiplatform.podsProject=sample/ios-app/Pods/Pods.xcodeproj
119

12-
android.useAndroidX=true
10+
android.useAndroidX=true

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
detektVersion = "1.15.0"
33
androidAppCompatVersion = "1.2.0"
44
androidSocketIoVersion = "1.0.0"
5-
kotlinxSerializationVersion = "1.2.1"
6-
mokoSocketIoVersion = "0.3.0"
5+
kotlinxSerializationVersion = "1.3.3"
6+
mokoSocketIoVersion = "0.4.0"
77
compileSdk = "28"
88
targetSdk = "28"
99
minSdk = "16"

gradle/wrapper/gradle-wrapper.jar

842 Bytes
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Wed May 17 12:41:59 AZT 2023
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)