Merge pull request #66 from Reedyuk/0.9.2

0.9.2

README.md

@@ -28,7 +28,13 @@ blueFalcon.scan()
 #### Install
 
 ```kotlin
-implementation 'dev.bluefalcon:blue-falcon-android:0.9.1'
+implementation 'dev.bluefalcon:blue-falcon-android:0.9.2'
+```
+
+And if you are using the debug variant:
+
+```kotlin
+implementation 'dev.bluefalcon:blue-falcon-android-debug:0.9.2'
 ```
 
 The Android sdk requires an Application context, we do this by passing in on the BlueFalcon constructor, in this example we are calling the code from an activity(this).

examples/Android-Example/build.gradle

@@ -58,7 +58,7 @@ android {
 }
 
 dependencies {
-    implementation 'dev.bluefalcon:blue-falcon-android:0.9.1'
+    implementation 'dev.bluefalcon:blue-falcon-android-debug:0.9.2'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'

library/build.gradle.kts

@@ -2,12 +2,15 @@ import java.util.*
 
 plugins {
     kotlin("multiplatform") version "1.4.31"
+    id("com.android.library")
     id("maven-publish")
     id("signing")
 }
 
 repositories {
     mavenCentral()
+    google()
+    jcenter()
 }
 
 //expose properties
@@ -33,17 +36,27 @@ val developerName: String by project
 val developerEmail: String by project
 val group: String by project
 
+android {
+    compileSdkVersion(29)
+    sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
+    defaultConfig {
+        minSdkVersion(24)
+        targetSdkVersion(29)
+    }
+}
 
 kotlin {
-
-    jvm("android") {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
-        }
-        testRuns["test"].executionTask.configure {
-            useJUnit()
-        }
+    android {
+        publishLibraryVariants("debug", "release")
     }
+//    jvm("android") {
+//        compilations.all {
+//            kotlinOptions.jvmTarget = "1.8"
+//        }
+//        testRuns["test"].executionTask.configure {
+//            useJUnit()
+//        }
+//    }
     js(LEGACY) {
         browser {
             testTask {
@@ -76,9 +89,7 @@ kotlin {
     }
 
     sourceSets {
-        val commonMain by getting {
-
-        }
+        val commonMain by getting {}
         val commonTest by getting {
             dependencies {
                 implementation(kotlin("test-common"))
@@ -87,7 +98,6 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                compileOnly("org.robolectric:android-all:9-robolectric-4913185-2")
             }
         }
         val jsMain by getting
@@ -166,4 +176,3 @@ signing {
     useInMemoryPgpKeys(signingKey, signingPassword)
     sign(publishing.publications)
 }
-

library/gradle.properties

@@ -12,7 +12,7 @@ org.gradle.configureondemand = false
 android.useAndroidX=true
 android.enableJetifier=true
 
-version=0.9.1
+version=0.9.2
 group=dev.bluefalcon
 libraryName=blue-falcon
 

library/settings.gradle.kts

@@ -1,3 +1,17 @@
+pluginManagement {
+    repositories {
+        google()
+        jcenter()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.namespace == "com.android" || requested.id.name == "kotlin-android-extensions") {
+                useModule("com.android.tools.build:gradle:4.0.1")
+            }
+        }
+    }
+}
 
-rootProject.name = "blue-falcon"
-
+rootProject.name = "blue-falcon"

library/src/androidMain/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest
         xmlns:android="http://schemas.android.com/apk/res/android"
-        package="dev.bluefalcon.library">
+        package="dev.bluefalcon.blueFalcon">
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />