Merge pull request #5 from doneill/feature/jsmain

Author: doneill

README.md

@@ -1,32 +1,28 @@
 # Kotlin Multiplatform Playground Template
 This project is for experimenting with Kotlin Multiplatform
 
-![kmp image](kmp-app.png)
+| Android       | Web           | iOS           | 
+| ------------- | ------------- | ------------- |
+| ![android](images/android.png)  | ![web](images/web.png)   | ![iOS](images/ios.png)   |
 
 ## Dependencies
  - [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html)
  - [Kotlin Ktor](https://ktor.io/clients/index.html)
  - [Kotlin Serialization](https://github.com/Kotlin/kotlinx.serialization)
+ - [Kotlin React](https://github.com/JetBrains/kotlin-wrappers/blob/master/kotlin-react/README.md)
  - [SQLDelight](https://cashapp.github.io/sqldelight/)
  - [Open Weather Map](https://openweathermap.org/)
 
  ## Open Weather Map
  To access the OpenWeatherMap API you need an [API Key](http://openweathermap.org/appid).
 
- ### Android
- To use your API Key, create a **gradle.properties** file in the root of the **app** module with a string value pair representing your API Key.  This file is not tracked in Git as it is for personal use.
+ ### Common Lib
+ The common library needs access to your api key to interact with the Open Weather Map API. Create a **gradle.properties** file in the root of the **common** module with a string value pair representing your API Key.  This file is not tracked in Git as it is for personal use.
 
  ```groovy
  OPENWEATHER_API_KEY = "YOUR-API-KEY"
  ```
 
-### iOS
-To use your API Key, modify the `apiKey` variable in `ViewController.swift`:
-
-```swift
-// replace with your api key
-let apiKey = "YOUR-API-KEY"
-```
 ## Blog Series
  - [Getting Started](http://gh.jdoneill.com/2019/12/06/kotlin-mulitplatform/)
  - [Multiplatform Persistence with SQLDelight](http://gh.jdoneill.com/2020/06/28/sqldelight/)

app/build.gradle.kts

@@ -16,12 +16,6 @@ android {
         versionCode = AppCoordinates.APP_VERSION_CODE
         versionName = AppCoordinates.APP_VERSION_NAME
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        if (project.hasProperty("OPENWEATHER_API_KEY")) {
-            buildConfigField("String", "OPENWEATHER_API_KEY", project.property("OPENWEATHER_API_KEY") as String)
-        } else {
-            buildConfigField("String", "OPENWEATHER_API_KEY", "\"\"")
-        }
     }
 
     buildTypes {

app/src/main/java/com/jdoneill/ktmultiplatform/ui/MainActivity.kt

@@ -8,7 +8,6 @@ import android.widget.TextView
 import com.jdoneill.api.RestApi
 import com.jdoneill.common.KmpDriverFactory
 import com.jdoneill.common.createDb
-import com.jdoneill.ktmultiplatform.BuildConfig
 import com.jdoneill.ktmultiplatform.R
 import com.jdoneill.common.getDate
 import com.jdoneill.db.KmpModelQueries
@@ -19,9 +18,6 @@ import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
-import kotlin.random.Random
-
-const val APIKEY = BuildConfig.OPENWEATHER_API_KEY
 
 const val DEGREE: String = "\u00B0"
 
@@ -46,18 +42,13 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         job = Job()
         api = RestApi()
 
-        val location = randomWaCoords()
-        Log.d("Random", location.toString())
-        getWeather(location, APIKEY)
+        getWeather()
 
         findViewById<TextView>(R.id.date_view).text = getDate()
     }
 
-    private fun getWeather(latLng: Pair<Double, Double>, apiKey: String) {
+    private fun getWeather() {
         api.getWeather(
-            lat = latLng.first.toString(),
-            lng = latLng.second.toString(),
-            apiKey = apiKey,
             success = ::parseResponse,
             failure = ::handleError
         )
@@ -95,20 +86,6 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
         }
     }
 
-    private fun randomWaCoords():Pair<Double, Double> {
-        val random = Random.Default
-
-        val lat = (45..49).shuffled().first()
-        val latDecimal = random.nextDouble()
-        val lng = (-124..-116).shuffled().first()
-        val lngDecimal = random.nextDouble()
-
-        val y = lat + latDecimal
-        val x = lng + lngDecimal
-
-        return Pair(y, x)
-    }
-
     private fun handleError(ex: Throwable) {
         launch(Main) {
             val msg = ex.message

build.gradle.kts

@@ -14,6 +14,7 @@ plugins {
     kotlin("android") version BuildPluginsVersion.KOTLIN apply false
     kotlin("plugin.serialization") version BuildPluginsVersion.KOTLIN
     id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT
+    id("com.github.gmazzo.buildconfig") version BuildPluginsVersion.BUILD_CONFIG
 }
 
 allprojects {
@@ -22,10 +23,7 @@ allprojects {
         google()
         mavenCentral()
         jcenter()
-        maven(url = "https://kotlin.bintray.com/kotlinx")
+        maven("https://kotlin.bintray.com/kotlinx")
+        maven("https://kotlin.bintray.com/kotlin-js-wrappers/")
     }
 }
-
-tasks.register("clean", Delete::class.java) {
-    delete(rootProject.buildDir)
-}

buildSrc/src/main/java/Dependencies.kt

@@ -23,6 +23,7 @@ object BuildPluginsVersion {
     const val GRADLE = "4.0.0"
     const val KOTLIN = "1.3.72"
     const val KTLINT = "9.2.1"
+    const val BUILD_CONFIG = "2.0.2"
 }
 
 object Plugins {
@@ -34,24 +35,29 @@ object Kotlin {
     const val SERIALIZATION = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Versions.SERIALIZER}"
     const val SERIALIZATION_COMMON = "org.jetbrains.kotlinx:kotlinx-serialization-runtime:${Versions.SERIALIZER}"
     const val SERIALIZATION_IOS = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-native:${Versions.SERIALIZER}"
+    const val SERIALIZATION_WEB = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:${Versions.SERIALIZER}"
 }
 
 object Coroutines {
     const val COMMON = "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Versions.COROUTINES}"
     const val JDK = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.COROUTINES}"
     const val NATIVE = "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.COROUTINES}"
     const val ANDROID = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.COROUTINES}"
+    const val WEB = "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Versions.COROUTINES}"
     const val TEST = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.COROUTINES}"
 }
 
 object Ktor {
     const val COMMON_CORE = "io.ktor:ktor-client-core:${Versions.KTOR}"
     const val ANDROID = "io.ktor:ktor-client-android:${Versions.KTOR}"
     const val IOS = "io.ktor:ktor-client-ios:${Versions.KTOR}"
+    const val WEB = "io.ktor:ktor-client-js:${Versions.KTOR}"
+    const val WEB_LOGGING = "io.ktor:ktor-client-logging-js:${Versions.KTOR}"
     const val IOS_CORE =     "io.ktor:ktor-client-core-native:${Versions.KTOR}"
     const val COMMON_SERIALIZATION ="io.ktor:ktor-client-serialization:${Versions.KTOR}"
     const val ANDROID_SERIALZATION ="io.ktor:ktor-client-serialization-jvm:${Versions.KTOR}"
     const val IOS_SERIALIZATION ="io.ktor:ktor-client-serialization-native:${Versions.KTOR}"
+    const val WEB_SERIALIZATION = "io.ktor:ktor-client-serialization-js:${Versions.KTOR}"
 }
 
 object SqlDelight{
@@ -61,6 +67,7 @@ object SqlDelight{
     const val RUNTIME_DRIVER_COMMON = "com.squareup.sqldelight:sqlite-driver:${Versions.SQLDELIGHT}"
     const val RUNTIME_DRIVER_IOS = "com.squareup.sqldelight:native-driver:${Versions.SQLDELIGHT}"
     const val RUNTIME_DRIVER_ANDROID = "com.squareup.sqldelight:android-driver:${Versions.SQLDELIGHT}"
+    const val RUNTIME_DRIVER_JS = "com.squareup.sqldelight:runtime-js:${Versions.SQLDELIGHT}"
 }
 
 object SupportLibs {

common/build.gradle.kts

@@ -1,10 +1,13 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import com.github.gmazzo.gradle.plugins.BuildConfigSourceSet
+
 
 plugins {
     kotlin("multiplatform")
     kotlin("plugin.serialization")
     id("com.android.library")
     id("com.squareup.sqldelight")
+    id("com.github.gmazzo.buildconfig")
 }
 
 android {
@@ -20,6 +23,7 @@ android {
 
 kotlin {
     android()
+    jvm()
 
     // select iOS target platform depending on the Xcode environment variables
     // iPhone simulator : presets.iosX64 | real iDevice 64 bit : presets.iosArm64
@@ -37,6 +41,10 @@ kotlin {
         }
     }
 
+    js {
+        browser {  }
+    }
+
     sourceSets["commonMain"].dependencies {
         // kotlin
         implementation(kotlin("stdlib-common", BuildPluginsVersion.KOTLIN))
@@ -76,6 +84,18 @@ kotlin {
         // SQL Delight
         implementation(SqlDelight.RUNTIME_DRIVER_IOS)
     }
+
+    sourceSets["jsMain"].dependencies {
+        implementation(kotlin("stdlib-js"))
+        // Coroutines
+        implementation(Coroutines.WEB)
+        // Ktor
+        implementation(Ktor.WEB)
+        // Serialize
+        implementation(Kotlin.SERIALIZATION_WEB)
+        // SQL Delight
+        implementation(SqlDelight.RUNTIME_DRIVER_JS)
+    }
 }
 
 val packForXcode by tasks.creating(Sync::class) {
@@ -105,11 +125,18 @@ val packForXcode by tasks.creating(Sync::class) {
     }
 }
 
+buildConfig {
+    if (project.hasProperty("OPENWEATHER_API_KEY")) {
+        buildConfigField("String", "OPENWEATHER_API_KEY", project.property("OPENWEATHER_API_KEY") as String)
+    } else {
+        buildConfigField("String", "OPENWEATHER_API_KEY", "\"\"")
+    }
+}
+
 sqldelight {
     database("KmpDb") {
         packageName = "com.jdoneill.db"
         sourceFolders = listOf("sqldelight")
     }
 }
-
 tasks.getByName("build").dependsOn(packForXcode)

common/src/commonMain/kotlin/com/jdoneill/api/RestApi.kt

@@ -1,7 +1,9 @@
 package com.jdoneill.api
 
+import com.jdoneill.common.BuildConfig
 import com.jdoneill.common.ApplicationDispatcher
 import com.jdoneill.model.WeatherResponse
+import com.jdoneill.util.RandomLocation
 
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
@@ -16,22 +18,29 @@ import kotlinx.serialization.json.Json
 class RestApi {
 
     companion object {
+        private const val API_KEY = BuildConfig.OPENWEATHER_API_KEY
+
         private const val API_V2 = "/data/2.5/"
         private const val API_V2_WEATHER = "$API_V2/weather"
         private const val BASE_URL = "https://api.openweathermap.org"
     }
 
     private val client = HttpClient()
 
-    fun getWeather(lat: String, lng: String, apiKey: String, success: (WeatherResponse) -> Unit, failure: (Throwable) -> Unit) {
+    fun getWeather(success: (WeatherResponse) -> Unit, failure: (Throwable) -> Unit) {
+
+        val location = RandomLocation.washingtonStateCoords()
+        val lat = location.first.toString()
+        val lng = location.second.toString()
+
         GlobalScope.launch(ApplicationDispatcher) {
             try {
                 val response = client.get<HttpStatement> {
                     url("$BASE_URL$API_V2_WEATHER")
                     parameter("units", "imperial")
                     parameter("lat", lat)
                     parameter("lon", lng)
-                    parameter("appid", apiKey)
+                    parameter("appid", API_KEY)
                 }.execute()
 
                 Json.nonstrict.parse(WeatherResponse.serializer(), response.readText())

common/src/commonMain/kotlin/com/jdoneill/util/RandomLocation.kt

@@ -0,0 +1,23 @@
+package com.jdoneill.util
+
+import kotlin.jvm.JvmStatic
+import kotlin.random.Random
+
+class RandomLocation {
+    companion object {
+        @JvmStatic
+        fun washingtonStateCoords():Pair<Double, Double> {
+            val random = Random.Default
+
+            val lat = (45..49).shuffled().first()
+            val latDecimal = random.nextDouble()
+            val lng = (-124..-116).shuffled().first()
+            val lngDecimal = random.nextDouble()
+
+            val y = lat + latDecimal
+            val x = lng + lngDecimal
+
+            return Pair(y, x)
+        }
+    }
+}

common/src/jsMain/kotlin/com/jdoneill/common/DateUtils.kt

@@ -0,0 +1,5 @@
+package com.jdoneill.common
+
+import kotlin.js.Date
+
+actual fun getCurrentDate() = Date().toString()

common/src/jsMain/kotlin/com/jdoneill/common/Dispatcher.kt

@@ -0,0 +1,6 @@
+package com.jdoneill.common
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+internal actual val ApplicationDispatcher: CoroutineDispatcher = Dispatchers.Default