Merge pull request #17 from salesforce/update-android

Update android for Nimbus 1.0

Author: paultiarks

NimbusPluginBarcodeScanner.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'NimbusPluginBarcodeScanner'
-  s.version          = '0.2.2'
+  s.version          = '0.2.3'
   s.summary          = 'A Nimbus plugin for scanning barcodes.'
 
   s.description      = <<-DESC

platforms/android/barcodescanner/src/main/java/com/salesforce/barcodescannerplugin/BarcodeScannerPlugin.kt

@@ -12,19 +12,17 @@ package com.salesforce.barcodescannerplugin
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.salesforce.nimbus.Extension
-import com.salesforce.nimbus.ExtensionMethod
-import com.salesforce.nimbus.NimbusExtension
+import com.salesforce.nimbus.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
-@Extension("barcodeScanner")
+@PluginOptions("barcodeScanner")
 class BarcodeScannerPlugin(private val activity: AppCompatActivity) : NimbusExtension, BarcodeScanner {
     private lateinit var scannerCallback: (barcode: BarcodeScannerResult?, error: String?) -> Unit
     private lateinit var barcodeOptions: BarcodeScannerOptions
 
-    @ExtensionMethod
+    @BoundMethod
     override fun beginCapture(
         options: BarcodeScannerOptions?,
         callback: (barcode: BarcodeScannerResult?, error: String?) -> Unit
@@ -37,12 +35,12 @@ class BarcodeScannerPlugin(private val activity: AppCompatActivity) : NimbusExte
         startScanner()
     }
 
-    @ExtensionMethod
+    @BoundMethod
     override fun resumeCapture() {
         startScanner()
     }
 
-    @ExtensionMethod
+    @BoundMethod
     override fun endCapture() {
         EventBus.getDefault().unregister(this)
     }

platforms/android/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = "1.3.70"
-    ext.nimbus_version = "0.0.7"
+    ext.nimbus_version = "1.+"
     repositories {
         google()
         jcenter()

platforms/android/demoapp/src/main/java/com/salesforce/barcodescannerdemo/MainActivity.kt

@@ -14,12 +14,12 @@ import android.webkit.WebView
 import androidx.appcompat.app.AppCompatActivity
 import com.salesforce.barcodescannerplugin.BarcodeScannerPlugin
 import com.salesforce.barcodescannerplugin.BarcodeScannerPluginBinder
-import com.salesforce.nimbus.NimbusBridge
+import com.salesforce.nimbus.Bridge
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
-    private val nimbusBridge = NimbusBridge()
+    private val nimbusBridge = Bridge()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

platforms/android/gradle.properties

@@ -13,6 +13,6 @@ BINTRAY_ORG=salesforce-mobile
 POM_SCM_CONNECTION=scm\:git\:git\://github.com/salesforce/nimbus-plugin-barcode-scanner.git
 POM_URL=https\://github.com/salesforce/nimbus-plugin-barcode-scanner
 android.enableJetifier=true
-VERSION=0.2.2
+VERSION=0.2.3
 kapt.incremental.apt=true
 kapt.use.worker.api=true