Merge pull request #2 from icerockdev/develop

Release 0.2.0

Author: Alex009

.github/workflows/compilation-check.yml

@@ -19,4 +19,4 @@ jobs:
     - name: Cocoapods install
       run: (cd sample/ios-app && pod install)
     - name: Check library
-      run: ./gradlew -PlibraryPublish detekt :socket-io:build
+      run: ./gradlew build publishToMavenLocal

.github/workflows/publish.yml

@@ -17,4 +17,4 @@ jobs:
       - name: Cocoapods install
         run: (cd sample/ios-app && pod install)
       - name: Publish library
-        run: ./gradlew -PlibraryPublish :socket-io:publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }}

README.md

@@ -1,8 +1,8 @@
 ![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://api.bintray.com/packages/icerockdev/moko/moko-socket-io/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-socket-io/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.3.72-orange)
+[![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://api.bintray.com/packages/icerockdev/moko/moko-socket-io/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-socket-io/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.10-orange)
 
-# Mobile Kotlin resources
-This is a Kotlin MultiPlatform library that provides access to the resources on iOS & Android with the support of the default system localization.
+# Mobile Kotlin socket io
+This is a Kotlin MultiPlatform library that provides real-time, event-based communication for iOS and Android.
 
 ## Table of Contents
 - [Features](#features)
@@ -19,13 +19,15 @@ This is a Kotlin MultiPlatform library that provides access to the resources on
 - **Socket.IO in common code** - actual implementations is [socket.io-client-java](https://github.com/socketio/socket.io-client-java) and [socket.io-client-swift](https://github.com/socketio/socket.io-client-swift);
 
 ## Requirements
-- Gradle version 5.6.4+
+- Gradle version 6.0+
 - Android API 16+
 - iOS version 9.0+
 
 ## Versions
 - kotlin 1.3.72
   - 0.1.0
+- kotlin 1.4.10
+  - 0.2.0
 
 ## Installation
 root build.gradle  
@@ -40,8 +42,8 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:socket-io:0.1.0")
-    commonMainApi("org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:0.20.0")
+    commonMainApi("dev.icerock.moko:socket-io:0.2.0")
+    commonMainApi("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC")
 }
 
 cocoaPods {
@@ -53,7 +55,7 @@ cocoaPods {
 
 Podfile
 ```ruby
-pod 'mokoSocketIo', :git => 'https://github.com/icerockdev/moko-socket-io.git', :tag => 'release/0.1.0'
+pod 'mokoSocketIo', :git => 'https://github.com/icerockdev/moko-socket-io.git', :tag => 'release/0.2.0'
 ```
 
 ## Usage
@@ -113,7 +115,6 @@ Please see more examples in the [sample directory](sample).
 ## Set Up Locally 
 - The [socket-io directory](socket-io) contains the `socket-io` library;
 - The [sample directory](sample) contains sample apps for Android and iOS; plus the mpp-library connected to the apps;
-- For local testing a use the `./publishToMavenLocal.sh` script - so that sample apps use the locally published version.
 
 ## Contributing
 All development (both new features and bug fixes) is performed in the `develop` branch. This way `master` always contains the sources of the most recently released version. Please send PRs with bug fixes to the `develop` branch. Documentation fixes in the markdown files are an exception to this rule. They are updated directly in `master`.

build.gradle.kts

@@ -6,35 +6,8 @@ plugins {
     plugin(Deps.Plugins.detekt) apply false
 }
 
-buildscript {
-    repositories {
-        mavenLocal()
-
-        jcenter()
-        google()
-
-        maven { url = uri("https://dl.bintray.com/kotlin/kotlin") }
-        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
-        maven { url = uri("https://plugins.gradle.org/m2/") }
-        maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
-    }
-    dependencies {
-        with(Deps.Plugins) {
-            listOf(
-                androidApplication,
-                androidLibrary,
-                kotlinMultiplatform,
-                kotlinKapt,
-                kotlinAndroid
-            )
-        }.let { plugins(it) }
-    }
-}
-
 allprojects {
     repositories {
-        mavenLocal()
-
         google()
         jcenter()
 
@@ -46,14 +19,24 @@ allprojects {
     apply(plugin = Deps.Plugins.detekt.id)
 
     configure<io.gitlab.arturbosch.detekt.extensions.DetektExtension> {
-        toolVersion = Versions.detekt
         input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin")
     }
 
     dependencies {
         "detektPlugins"(Deps.Libs.Jvm.detektFormatting)
     }
 
+    plugins.withId(Deps.Plugins.androidLibrary.id) {
+        configure<com.android.build.gradle.LibraryExtension> {
+            compileSdkVersion(Deps.Android.compileSdk)
+
+            defaultConfig {
+                minSdkVersion(Deps.Android.minSdk)
+                targetSdkVersion(Deps.Android.targetSdk)
+            }
+        }
+    }
+
 }
 
 tasks.register("clean", Delete::class).configure {

buildSrc/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `kotlin-dsl`
+    id("org.jetbrains.kotlin.jvm") version("1.4.10")
 }
 
 repositories {
@@ -10,11 +10,7 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.6.1")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
-    implementation("com.android.tools.build:gradle:3.6.3")
-}
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
-}
+    implementation("dev.icerock:mobile-multiplatform:0.7.1")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10")
+    implementation("com.android.tools.build:gradle:4.0.1")
+}

buildSrc/src/main/kotlin/Deps.kt

@@ -3,52 +3,54 @@
  */
 
 object Deps {
+
+    private const val kotlinVersion = "1.4.0"
+    private const val detektVersion = "1.7.4"
+
+    private const val androidAppCompatVersion = "1.1.0"
+    private const val androidSocketIoVersion = "1.0.0"
+    private const val kotlinxSerializationVersion = "1.0.0-RC"
+
+    const val mokoSocketIoVersion = "0.2.0"
+
+
+    object Android {
+        const val compileSdk = 28
+        const val targetSdk = 28
+        const val minSdk = 16
+    }
+
     object Plugins {
-        val androidApplication = PluginDesc(id = "com.android.application")
-        val androidLibrary = PluginDesc(id = "com.android.library")
+        val androidApplication = GradlePlugin(id = "com.android.application")
+        val androidLibrary = GradlePlugin(id = "com.android.library")
 
-        val kotlinMultiplatform = PluginDesc(id = "org.jetbrains.kotlin.multiplatform")
-        val kotlinKapt = PluginDesc(id = "kotlin-kapt")
-        val kotlinAndroid = PluginDesc(id = "kotlin-android")
-        val kotlinAndroidExtensions = PluginDesc(id = "kotlin-android-extensions")
+        val kotlinMultiplatform = GradlePlugin(id = "org.jetbrains.kotlin.multiplatform")
+        val kotlinAndroid = GradlePlugin(id = "kotlin-android")
+        val kotlinAndroidExtensions = GradlePlugin(id = "kotlin-android-extensions")
 
-        val mobileMultiplatform = PluginDesc(id = "dev.icerock.mobile.multiplatform")
+        val mobileMultiplatform = GradlePlugin(id = "dev.icerock.mobile.multiplatform")
+        val mavenPublish = GradlePlugin(id = "org.gradle.maven-publish")
 
-        val detekt = PluginDesc(id = "io.gitlab.arturbosch.detekt", version = Versions.detekt)
+        val detekt = GradlePlugin(id = "io.gitlab.arturbosch.detekt", version = detektVersion)
+        val iosFramework = GradlePlugin(id = "dev.icerock.mobile.multiplatform.ios-framework")
     }
 
     object Libs {
         object Android {
-            val kotlinStdLib = AndroidLibrary(
-                name = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
-            )
-            val appCompat = AndroidLibrary(
-                name = "androidx.appcompat:appcompat:${Versions.Libs.Android.appCompat}"
-            )
-            val socketIo = AndroidLibrary(
-                name = "io.socket:socket.io-client:${Versions.Libs.Android.socketIo}"
-            )
+            const val appCompat = "androidx.appcompat:appcompat:$androidAppCompatVersion"
+
+            const val socketIo = "io.socket:socket.io-client:$androidSocketIoVersion"
         }
 
         object MultiPlatform {
-            val kotlinStdLib = MultiPlatformLibrary(
-                android = Android.kotlinStdLib.name,
-                common = "org.jetbrains.kotlin:kotlin-stdlib-common:${Versions.kotlin}"
-            )
-            val serialization = MultiPlatformLibrary(
-                android = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Versions.Libs.MultiPlatform.serialization}",
-                common = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:${Versions.Libs.MultiPlatform.serialization}",
-                ios = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:${Versions.Libs.MultiPlatform.serialization}"
-            )
-            val mokoSocketIo = MultiPlatformLibrary(
-                common = "dev.icerock.moko:socket-io:${Versions.Libs.MultiPlatform.mokoSocketIo}",
-                iosX64 = "dev.icerock.moko:socket-io-iosx64:${Versions.Libs.MultiPlatform.mokoSocketIo}",
-                iosArm64 = "dev.icerock.moko:socket-io-iosarm64:${Versions.Libs.MultiPlatform.mokoSocketIo}"
-            )
+
+            const val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-core:$kotlinxSerializationVersion"
+            const val mokoSocketIo = "dev.icerock.moko:socket-io:$mokoSocketIoVersion"
         }
 
         object Jvm {
-            const val detektFormatting = "io.gitlab.arturbosch.detekt:detekt-formatting:${Versions.detekt}"
+            const val detektFormatting =
+                "io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion"
         }
     }
 }

buildSrc/src/main/kotlin/PluginDesc.kt

@@ -3,8 +3,12 @@ org.gradle.configureondemand=false
 org.gradle.parallel=true
 
 kotlin.code.style=official
+kotlin.native.enableDependencyPropagation=false
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 android.useAndroidX=true
-android.enableJetifier=true
 
-kotlin.native.enableParallelExecutionCheck=false
+# Workaround for Bintray treating .sha512 files as artifacts
+# https://github.com/gradle/gradle/issues/11412
+systemProp.org.gradle.internal.publish.checksums.insecure=true

buildSrc/src/main/kotlin/Versions.kt

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists