Merge pull request #76 from Reedyuk/1.5.30-M1

Attempt to support apple silicon and kotlin 1.5.30
Reedyuk · Jul 22, 2021 · ae386a7 · ae386a7
2 parents 68a9ccf + 7b5a25b
commit ae386a7
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 22 deletions.
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -9,6 +9,9 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 11
     - name: Run gradle build
       run: ./Library/gradlew -p ./Library build
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,6 +9,9 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 11
     - name: Run gradle build
       run: ./Library/gradlew -p ./Library build
     - name: Run publish

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ![Blue Falcon](bluefalcon.png) Blue-Falcon ![CI](https://github.com/Reedyuk/blue-falcon/workflows/CI/badge.svg) [![Kotlin](https://img.shields.io/badge/kotlin-1.5.0-blue.svg)](http://kotlinlang.org) ![badge][badge-android] ![badge][badge-native] ![badge][badge-mac] ![badge][badge-rpi] ![badge][badge-js]
+# ![Blue Falcon](bluefalcon.png) Blue-Falcon ![CI](https://github.com/Reedyuk/blue-falcon/workflows/CI/badge.svg) [![Kotlin](https://img.shields.io/badge/kotlin-1.5.30-M1-blue.svg)](http://kotlinlang.org) ![badge][badge-android] ![badge][badge-native] ![badge][badge-mac] ![badge][badge-rpi] ![badge][badge-js]
 
 A Bluetooth "Cross Platform" Kotlin Multiplatform library for iOS, Android, MacOS, Raspberry Pi and Javascript.
 
@@ -28,13 +28,13 @@ blueFalcon.scan()
 #### Install
 
 ```kotlin
-implementation 'dev.bluefalcon:blue-falcon-android:0.9.6'
+implementation 'dev.bluefalcon:blue-falcon-android:0.9.7'
 ```
 
 And if you are using the debug variant:
 
 ```kotlin
-implementation 'dev.bluefalcon:blue-falcon-android-debug:0.9.6'
+implementation 'dev.bluefalcon:blue-falcon-android-debug:0.9.7'
 ```
 
 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).
@@ -57,7 +57,7 @@ try {
 The Raspberry Pi library is using Java.
 
 ```kotlin
-implementation 'dev.bluefalcon:blue-falcon-rpi:0.9.6'
+implementation 'dev.bluefalcon:blue-falcon-rpi:0.9.7'
 ```
 
 ### Javascript 
@@ -73,7 +73,7 @@ See the JS-Example for details on how to use.
 ### Install
 
 ```kotlin
-implementation 'dev.bluefalcon:blue-falcon:0.9.6'
+implementation 'dev.bluefalcon:blue-falcon:0.9.7'
 ```
 
 Please look at the Kotlin Multiplatform example in the Examples folder.

diff --git a/examples/Android-Example/build.gradle b/examples/Android-Example/build.gradle
@@ -16,7 +16,7 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
-        classpath('com.android.tools.build:gradle:4.2.0-alpha01')
+        classpath('com.android.tools.build:gradle:7.1.0-alpha04')
     }
 
 }

diff --git a/examples/Android-Example/gradle/wrapper/gradle-wrapper.properties b/examples/Android-Example/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
diff --git a/examples/KotlinMP-Example/app/build.gradle b/examples/KotlinMP-Example/app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.jetbrains.kotlin.multiplatform' version '1.5.0'
+    id 'org.jetbrains.kotlin.multiplatform' version '1.5.30-M1'
 }
 repositories {
     mavenLocal()
@@ -59,7 +59,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation("dev.bluefalcon:blue-falcon:$bluefalcon")
-                implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt")
+                implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.30-M1-native-mt")
             }
         }
         commonTest {

diff --git a/examples/KotlinMP-Example/build.gradle b/examples/KotlinMP-Example/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-rc03'
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha04'
     }
 }
 repositories {

diff --git a/examples/KotlinMP-Example/gradle.properties b/examples/KotlinMP-Example/gradle.properties
@@ -1,6 +1,6 @@
 kotlin.code.style=official
 bluefalcon=0.9.5
-kotlin_version=1.5.0
+kotlin_version=1.5.30-M1
 android_tools_version=3.4.1
 anko_version=0.10.8
 org.gradle.jvmargs=-Xmx1536m

diff --git a/examples/KotlinMP-Example/gradle/wrapper/gradle-wrapper.jar b/examples/KotlinMP-Example/gradle/wrapper/gradle-wrapper.jar
diff --git a/examples/KotlinMP-Example/gradle/wrapper/gradle-wrapper.properties b/examples/KotlinMP-Example/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
diff --git a/examples/KotlinMP-Example/settings.gradle b/examples/KotlinMP-Example/settings.gradle
@@ -1,5 +1,3 @@
 rootProject.name = 'KotlinMP'
 
 include ':app'
-
-enableFeaturePreview("GRADLE_METADATA")
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -1,7 +1,7 @@
 import java.util.*
 
 plugins {
-    kotlin("multiplatform") version "1.5.0"
+    kotlin("multiplatform") version "1.5.30-M1"
     id("com.android.library")
     id("maven-publish")
     id("signing")

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -12,7 +12,7 @@ org.gradle.configureondemand = false
 android.useAndroidX=true
 android.enableJetifier=true
 
-version=0.9.6
+version=0.9.7
 group=dev.bluefalcon
 libraryName=blue-falcon
 

diff --git a/library/gradle/wrapper/gradle-wrapper.jar b/library/gradle/wrapper/gradle-wrapper.jar
diff --git a/library/gradle/wrapper/gradle-wrapper.properties b/library/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library/gradlew b/library/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

diff --git a/library/settings.gradle.kts b/library/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
     resolutionStrategy {
         eachPlugin {
             if (requested.id.namespace == "com.android" || requested.id.name == "kotlin-android-extensions") {
-                useModule("com.android.tools.build:gradle:4.0.1")
+                useModule("com.android.tools.build:gradle:7.1.0-alpha04")
             }
         }
     }

diff --git a/library/src/iosMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt b/library/src/iosMain/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt
@@ -10,7 +10,6 @@ actual class BluetoothCharacteristic(val characteristic: CBCharacteristic) {
     actual val name: String?
         get() = characteristic.UUID.description()
     actual val value: ByteArray?
-        @ExperimentalUnsignedTypes
         get() = characteristic.value?.let { data ->
             ByteArray(data.length.toInt()).apply {
                 usePinned {

diff --git a/library/src/macosX64Main/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt b/library/src/macosX64Main/kotlin/dev/bluefalcon/BluetoothCharacteristic.kt
@@ -10,7 +10,6 @@ actual class BluetoothCharacteristic(val characteristic: CBCharacteristic) {
     actual val name: String?
         get() = characteristic.UUID.description
     actual val value: ByteArray?
-        @ExperimentalUnsignedTypes
         get() = characteristic.value?.let { data ->
             ByteArray(data.length.toInt()).apply {
                 usePinned {