Skip to content

Commit 10c8834

Browse files
authored
Merge pull request #24 from nagizade/master
upgraded dependencies and added iosSimulatorArm64 source set
2 parents 2ec2915 + 50cd84e commit 10c8834

File tree

19 files changed

+221
-153
lines changed

19 files changed

+221
-153
lines changed

.github/workflows/compilation-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ 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

.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: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This is a Kotlin MultiPlatform library that provides real-time, event-based comm
2424
- iOS version 11.0+
2525

2626
## Installation
27-
root build.gradle
27+
### root build.gradle
2828
```groovy
2929
allprojects {
3030
repositories {
@@ -33,12 +33,47 @@ allprojects {
3333
}
3434
```
3535

36-
project build.gradle
36+
### 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")
40+
}
41+
```
42+
43+
#### With JetBrains cocoapods plugin
44+
project build.gradle
45+
```
46+
plugins {
47+
kotlin("native.cocoapods")
48+
}
49+
50+
...
51+
52+
kotlin {
53+
cocoapods {
54+
...
55+
56+
// 11.0 minimal supported
57+
ios.deploymentTarget = "11.0"
58+
59+
// add native dependency
60+
pod(name = "mokoSocketIo") {
61+
source = git(url = "https://github.com/icerockdev/moko-socket-io.git") {
62+
tag = "release/0.4.0"
63+
}
64+
}
65+
}
4166
}
67+
```
68+
69+
#### With IceRock cocoapods plugin
70+
project build.gradle
71+
```
72+
plugins {
73+
id("dev.icerock.mobile.multiplatform.cocoapods")
74+
}
75+
76+
...
4277
4378
cocoaPods {
4479
podsProject = file("../ios-app/Pods/Pods.xcodeproj") // here should be path to Pods xcode project
@@ -49,7 +84,7 @@ cocoaPods {
4984

5085
Podfile
5186
```ruby
52-
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'
5388
```
5489

5590
## 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)