Updated dependencies

MillerTechnologyPeru · Nov 9, 2018 · 992c3ab · 992c3ab
1 parent 397874e
commit 992c3ab
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 1,149 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -29,8 +29,6 @@ dependencies {
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation 'com.github.PureSwift:SwiftAndroidSupport:0.2.4'
-
-    //implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

diff --git a/Android/app/src/main/swift/Package.resolved b/Android/app/src/main/swift/Package.resolved
@@ -3,16 +3,25 @@
     "pins": [
       {
         "package": "Android",
-        "repositoryURL": "git@github.com:PureSwift/Android.git",
+        "repositoryURL": "https://github.com/PureSwift/Android.git",
         "state": {
           "branch": "master",
-          "revision": "7cdee606d0ed911a434cd7b11255f436a3e83d00",
+          "revision": "52f5de452537f685391d9062d36512f1faa20cb5",
+          "version": null
+        }
+      },
+      {
+        "package": "AndroidBluetooth",
+        "repositoryURL": "https://github.com/PureSwift/AndroidBluetooth.git",
+        "state": {
+          "branch": "master",
+          "revision": "182eb83847ea462ce1a1f858ff6ee25cf2c7a0b4",
           "version": null
         }
       },
       {
         "package": "AndroidUIKit",
-        "repositoryURL": "git@github.com:PureSwift/AndroidUIKit.git",
+        "repositoryURL": "https://github.com/PureSwift/AndroidUIKit.git",
         "state": {
           "branch": "master",
           "revision": "35a033c258978feab858a27f0f0c33637fa56c50",
@@ -24,7 +33,7 @@
         "repositoryURL": "https://github.com/PureSwift/Bluetooth.git",
         "state": {
           "branch": "master",
-          "revision": "ba4562a36d920ade281db5c74f76828cfa91864a",
+          "revision": "d836f386179e3d113715b72cc5455c7823d7d119",
           "version": null
         }
       },
@@ -39,10 +48,10 @@
       },
       {
         "package": "GATT",
-        "repositoryURL": "git@github.com:PureSwift/GATT.git",
+        "repositoryURL": "https://github.com/PureSwift/GATT.git",
         "state": {
           "branch": "master",
-          "revision": "0b41cbd7fe9531c0108988b9041b05adde94775d",
+          "revision": "aca3caaff6f5f847bbc4bbb3cd669374b859dc5c",
           "version": null
         }
       },

diff --git a/Android/app/src/main/swift/Package.swift b/Android/app/src/main/swift/Package.swift
@@ -4,18 +4,30 @@ import PackageDescription
 let package = Package(
     name: "BluetoothExplorer",
     products: [
-        .library(name: "BluetoothExplorer", type: .dynamic, targets: ["BluetoothExplorerAndroid"]),
+        .library(
+            name: "BluetoothExplorer",
+            type: .dynamic,
+            targets: ["BluetoothExplorerAndroid"]
+        )
     ],
     dependencies: [
-        .package(url: "[email protected]:PureSwift/Android.git", .branch("master")),
-        .package(url: "[email protected]:PureSwift/AndroidUIKit.git", .branch("master")),
-        .package(url: "[email protected]:PureSwift/GATT.git", .branch("master"))
+        .package(
+            url: "https://github.com/PureSwift/AndroidBluetooth.git",
+            .branch("master")
+        ),
+        .package(
+            url: "https://github.com/PureSwift/AndroidUIKit.git",
+            .branch("master")
+        )
     ],
     targets: [
         .target(
             name: "BluetoothExplorerAndroid",
-            dependencies: ["GATT", "Android", "AndroidBluetooth", "AndroidUIKit"],
+            dependencies: [
+                "AndroidBluetooth",
+                "AndroidUIKit"
+            ],
             path: "Sources"
-        ),
+        )
     ]
 )
diff --git a/Android/app/src/main/swift/Sources/AndroidAdvertisement.swift b/Android/app/src/main/swift/Sources/AndroidAdvertisement.swift