#13 update to kotlin 1.5.10

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://img.shields.io/badge/kotlin-1.4.31-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://img.shields.io/maven-central/v/dev.icerock.moko/socket-io) ](https://repo1.maven.org/maven2/dev/icerock/moko/socket-io) ![kotlin-version](https://img.shields.io/badge/kotlin-1.5.10-orange)
 
 # Mobile Kotlin socket io
 This is a Kotlin MultiPlatform library that provides real-time, event-based communication for iOS and Android.
@@ -23,16 +23,6 @@ This is a Kotlin MultiPlatform library that provides real-time, event-based comm
 - Android API 16+
 - iOS version 9.0+
 
-## Versions
-### Bintray
-- kotlin 1.3.72
-  - 0.1.0
-- kotlin 1.4.10
-  - 0.2.0
-### mavenCentral
-- kotlin 1.4.31
-  - 0.2.1
-
 ## Installation
 root build.gradle  
 ```groovy
@@ -46,8 +36,8 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:socket-io:0.2.1")
-    commonMainApi("org.jetbrains.kotlinx:kotlinx-serialization-core:1.0.0-RC")
+    commonMainApi("dev.icerock.moko:socket-io:0.3.0")
+    commonMainApi("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.1")
 }
 
 cocoaPods {
@@ -59,7 +49,7 @@ cocoaPods {
 
 Podfile
 ```ruby
-pod 'mokoSocketIo', :git => 'https://github.com/icerockdev/moko-socket-io.git', :tag => 'release/0.2.1'
+pod 'mokoSocketIo', :git => 'https://github.com/icerockdev/moko-socket-io.git', :tag => 'release/0.3.0'
 ```
 
 ## Usage

build.gradle.kts

@@ -3,43 +3,41 @@
  */
 
 plugins {
-    plugin(Deps.Plugins.detekt) apply false
+    id("io.gitlab.arturbosch.detekt") version("1.15.0") apply(false)
 }
 
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
-
-        jcenter {
-            content {
-                includeGroup("org.jetbrains.trove4j")
-                includeGroup("org.jetbrains.kotlinx")
-            }
-        }
+buildscript {
+    dependencies {
+        classpath("dev.icerock.moko:resources-generator:0.15.1")
+
+        classpath("dev.icerock:mobile-multiplatform:0.10.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10")
+        classpath("com.android.tools.build:gradle:4.2.1")
     }
+}
+
+allprojects {
 
-    apply(plugin = Deps.Plugins.detekt.id)
+    apply(plugin = "io.gitlab.arturbosch.detekt")
 
     configure<io.gitlab.arturbosch.detekt.extensions.DetektExtension> {
-        input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin")
+        input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin", "src/commonJvm/kotlin")
     }
 
     dependencies {
-        "detektPlugins"(Deps.Libs.Jvm.detektFormatting)
+        "detektPlugins"(rootProject.libs.detektFormatting)
     }
 
-    plugins.withId(Deps.Plugins.androidLibrary.id) {
+    plugins.withId("com.android.library") {
         configure<com.android.build.gradle.LibraryExtension> {
-            compileSdkVersion(Deps.Android.compileSdk)
+            compileSdkVersion(libs.versions.compileSdk.get().toInt())
 
             defaultConfig {
-                minSdkVersion(Deps.Android.minSdk)
-                targetSdkVersion(Deps.Android.targetSdk)
+                minSdkVersion(libs.versions.minSdk.get().toInt())
+                targetSdkVersion(libs.versions.targetSdk.get().toInt())
             }
         }
     }
-
 }
 
 tasks.register("clean", Delete::class).configure {

gradle/libs.versions.toml

@@ -0,0 +1,18 @@
+[versions]
+kotlinVersion = "1.5.10"
+detektVersion = "1.15.0"
+androidAppCompatVersion = "1.2.0"
+androidSocketIoVersion = "1.0.0"
+kotlinxSerializationVersion = "1.2.1"
+mokoSocketIoVersion = "0.3.0"
+compileSdk = "28"
+targetSdk = "28"
+minSdk = "16"
+
+[libraries]
+appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
+socketIo = { module = "io.socket:socket.io-client", version.ref = "androidSocketIoVersion" }
+serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationVersion" }
+mokoSocketIo = { module = "dev.icerock.moko:socket-io", version.ref = "mokoSocketIoVersion" }
+detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detektVersion" }
+

gradle/wrapper/gradle-wrapper.properties

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

sample/android-app/build.gradle.kts

@@ -3,20 +3,20 @@
  */
 
 plugins {
-    plugin(Deps.Plugins.androidApplication)
-    plugin(Deps.Plugins.kotlinAndroid)
+    id("com.android.application")
+    id("kotlin-android")
 }
 
 android {
-    compileSdkVersion(Deps.Android.compileSdk)
+    compileSdkVersion(libs.versions.compileSdk.get().toInt())
 
     dexOptions {
         javaMaxHeapSize = "2g"
     }
 
     defaultConfig {
-        minSdkVersion(Deps.Android.minSdk)
-        targetSdkVersion(Deps.Android.targetSdk)
+        minSdkVersion(libs.versions.minSdk.get().toInt())
+        targetSdkVersion(libs.versions.targetSdk.get().toInt())
 
         applicationId = "dev.icerock.moko.samples.socketio"
 
@@ -45,7 +45,7 @@ android {
 
 dependencies {
 
-    implementation(Deps.Libs.Android.appCompat)
+    implementation(libs.appCompat)
 
-    implementation(project("${parent!!.path}:mpp-library"))
+    implementation(projects.sample.mppLibrary)
 }

sample/ios-app/Podfile.lock

@@ -29,4 +29,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: f881c83f3f3582ddcc6b0f6d9bb6323f43a7082a
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.1

sample/ios-app/TestProj.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

sample/mpp-library/build.gradle.kts

@@ -3,20 +3,17 @@
  */
 
 plugins {
-    plugin(Deps.Plugins.androidLibrary)
-    plugin(Deps.Plugins.kotlinMultiplatform)
-    plugin(Deps.Plugins.mobileMultiplatform)
-    plugin(Deps.Plugins.iosFramework)
+    id("com.android.library")
+    id("org.jetbrains.kotlin.multiplatform")
+    id("dev.icerock.mobile.multiplatform")
+    id("dev.icerock.mobile.multiplatform.ios-framework")
 }
 
 dependencies {
-    commonMainImplementation(Deps.Libs.MultiPlatform.serialization)
-    commonMainApi(Deps.Libs.MultiPlatform.mokoSocketIo)
+    commonMainImplementation(libs.serialization)
+    commonMainApi(projects.socketIo)
 }
 
-framework {
-    export(project(":socket-io"))
-}
 
 cocoaPods {
     podsProject = file("../ios-app/Pods/Pods.xcodeproj")

settings.gradle.kts

@@ -2,6 +2,33 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+enableFeaturePreview("VERSION_CATALOGS")
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+pluginManagement {
+    repositories {
+        mavenCentral()
+        google()
+
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        google()
+
+        jcenter {
+            content {
+                includeGroup("org.jetbrains.trove4j")
+                includeGroup("org.jetbrains.kotlinx")
+            }
+        }
+    }
+}
+
+
 include(":socket-io")
 include(":sample:android-app")
 include(":sample:mpp-library")

socket-io/build.gradle.kts

@@ -6,24 +6,45 @@ import java.util.Base64
 import kotlin.text.String
 
 plugins {
-    plugin(Deps.Plugins.androidLibrary)
-    plugin(Deps.Plugins.kotlinMultiplatform)
-    plugin(Deps.Plugins.kotlinAndroidExtensions)
-    plugin(Deps.Plugins.mobileMultiplatform)
-    plugin(Deps.Plugins.mavenPublish)
-    plugin(Deps.Plugins.signing)
+    id("com.android.library")
+    id("org.jetbrains.kotlin.multiplatform")
+    id("kotlin-android-extensions")
+    id("dev.icerock.mobile.multiplatform")
+    id("org.gradle.maven-publish")
+    id("signing")
 }
 
 group = "dev.icerock.moko"
-version = Deps.mokoSocketIoVersion
+version = libs.versions.mokoSocketIoVersion.get()
 
-dependencies {
-    commonMainImplementation(Deps.Libs.MultiPlatform.serialization)
+kotlin {
+    jvm()
+
+    sourceSets {
+        val commonMain by getting
+
+        val commonJvm = create("commonJvm") {
+            dependsOn(commonMain)
+        }
+
+        val androidMain by getting {
+            dependsOn(commonJvm)
+        }
 
-    androidMainImplementation(Deps.Libs.Android.appCompat)
-    androidMainImplementation(Deps.Libs.Android.socketIo) {
+        val jvmMain by getting {
+            dependsOn(commonJvm)
+        }
+
+    }
+}
+
+dependencies {
+    commonMainImplementation(libs.serialization)
+    androidMainImplementation(libs.appCompat)
+    "commonJvmImplementation"(libs.socketIo) {
         exclude(group = "org.json", module = "json")
     }
+    "jvmMainImplementation"(libs.socketIo)
 }
 
 val javadocJar by tasks.registering(Jar::class) {