Merge pull request #150 from algolia/develop

Version 1.2.0

Author: q-litzler

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.2.0
+
+- Updated Kotlin `1.3.60`
+- Ktor `1.2.6`
+- Add `hasPendingMapping` method to multi cluster management #149
+- Add `assignUserIDs` method to multi cluster management #144
+- Add `explain decompouding` feature #147
+- Add `filterPromotes` parameter to `Rule.Consequence` #142
+- Add Android multiplatform artifact (`com.algolia:algoliasearch-client-kotlin-android`), targeting SDK 29 #132
+
 # 1.1.4
 
 - Updated Kotlin to `1.3.50`

Gemfile.lock

@@ -103,7 +103,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    rubyzip (1.2.2)
+    rubyzip (1.3.0)
     security (0.1.3)
     signet (0.11.0)
       addressable (~> 2.3)

build.gradle.kts

@@ -1,26 +1,68 @@
+import com.android.build.gradle.LibraryExtension
 import com.jfrog.bintray.gradle.tasks.BintrayUploadTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.net.URI
 
+buildscript {
+    repositories {
+        google()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:3.5.2")
+    }
+}
 
 plugins {
-    id("kotlin-multiplatform") version "1.3.50"
-    id("kotlinx-serialization") version "1.3.50"
+    id("kotlin-multiplatform") version "1.3.60"
+    id("kotlinx-serialization") version "1.3.60"
     id("maven-publish")
     id("com.jfrog.bintray") version "1.8.4"
     id("com.github.kukuhyoniatmoko.buildconfigkotlin") version "1.0.5"
 }
 
-version = Library.version
-group = Library.group
+apply(plugin = "com.android.library")
 
 repositories {
     jcenter()
+    google()
     mavenCentral()
     maven { url = URI("https://dl.bintray.com/kotlin/ktor") }
     maven { url = URI("https://kotlin.bintray.com/kotlinx") }
 }
 
+version = Library.version
+group = Library.group
+
+extensions.getByType(LibraryExtension::class.java).apply {
+    compileSdkVersion(29)
+
+    defaultConfig {
+        minSdkVersion(17)
+        targetSdkVersion(29)
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    testOptions.unitTests.isIncludeAndroidResources = true
+
+    sourceSets {
+        getByName("main") {
+            manifest.srcFile("src/androidMain/AndroidManifest.xml")
+            java.srcDirs("src/androidMain/kotlin")
+            res.srcDirs("src/androidMain/res")
+        }
+        getByName("test") {
+            java.srcDirs("src/androidTest/kotlin")
+            res.srcDirs("src/androidTest/res")
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    testOptions.unitTests.isIncludeAndroidResources = true
+}
+
 buildConfigKotlin {
     sourceSet("metadata") {
         buildConfig(name = "version", value = Library.version)
@@ -35,6 +77,17 @@ kotlin {
             }
         }
     }
+    android {
+        mavenPublication {
+            artifactId = "${Library.artifact}-android"
+        }
+        publishLibraryVariants("release")
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
     sourceSets {
         all {
             languageSettings.progressiveMode = true
@@ -76,6 +129,26 @@ kotlin {
                 implementation(Ktor("client-android"))
             }
         }
+        val androidMain by getting {
+            dependencies {
+                api(kotlin("stdlib-jdk8"))
+                api(Ktor("client-core-jvm"))
+                api(Ktor("client-json-jvm"))
+                api(Ktor("client-logging-jvm"))
+                api(Ktor("client-serialization-jvm"))
+            }
+        }
+        val androidTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(kotlin("test-junit"))
+                implementation(Ktor("client-mock-jvm"))
+                implementation(Ktor("client-android"))
+                implementation(AndroidTestRunner())
+                implementation(AndroidTestExtRunner())
+                implementation(Robolectric())
+            }
+        }
     }
 }
 
@@ -151,9 +224,8 @@ bintray {
 
 tasks {
     val bintrayUpload by getting(BintrayUploadTask::class) {
-        dependsOn(publishToMavenLocal)
         doFirst {
-            setPublications("jvm", "metadata")
+            setPublications("jvm", "metadata", "androidRelease")
         }
     }
     withType<KotlinCompile> {

buildSrc/src/main/kotlin/AndroidTestExtRunner.kt

@@ -0,0 +1,6 @@
+object AndroidTestExtRunner : Dependency {
+
+    override val group = "androidx.test.ext"
+    override val artifact = "junit"
+    override val version = "1.1.1"
+}

buildSrc/src/main/kotlin/AndroidTestRunner.kt

@@ -0,0 +1,6 @@
+object AndroidTestRunner : Dependency {
+
+    override val group = "androidx.test"
+    override val artifact = "runner"
+    override val version = "1.2.0"
+}

buildSrc/src/main/kotlin/Dependency.kt

@@ -4,7 +4,9 @@ interface Dependency {
     val artifact: String
     val version: String
 
-    operator fun invoke(module: String): String {
-        return "$group:$artifact-$module:$version"
+    operator fun invoke(module: String? = null): String {
+        val optionalModule = if (module != null) "-$module" else ""
+
+        return "$group:$artifact$optionalModule:$version"
     }
 }

buildSrc/src/main/kotlin/Ktor.kt

@@ -2,5 +2,5 @@ object Ktor : Dependency {
 
     override val group = "io.ktor"
     override val artifact = "ktor"
-    override val version = "1.2.4"
+    override val version = "1.2.6"
 }

buildSrc/src/main/kotlin/Library.kt

@@ -2,5 +2,5 @@ object Library: Dependency {
 
     override val group = "com.algolia"
     override val artifact = "algoliasearch-client-kotlin"
-    override val version = "1.1.4"
+    override val version = "1.2.0"
 }

buildSrc/src/main/kotlin/Robolectric.kt

@@ -0,0 +1,6 @@
+object Robolectric : Dependency {
+
+    override val group = "org.robolectric"
+    override val artifact = "robolectric"
+    override val version = "4.3.1"
+}

gradle.properties

@@ -1,2 +1,3 @@
 kotlin.code.style=official
-org.gradle.parallel=true
+org.gradle.parallel=true
+android.enableUnitTestBinaryResources=true