Remove our custom activity because it's no longer needed (since Nativ…

…eScript 5.4.0) #38
EddyVerbruggen · Jun 26, 2019 · 789f87c · 789f87c
1 parent 52ef308
commit 789f87c
Show file tree

Hide file tree

Showing 11 changed files with 295 additions and 386 deletions.
diff --git a/README.md b/README.md
@@ -49,6 +49,8 @@ The [demo app](demo) has this:
 ```
 
 ## Android Setup
+> ⚠️ Since plugin version 4.0.0 this section is no longer needed, but you HAVE to run NativeScript 5.4.0 or newer. If you need to support older NativeScript versions, please stick to plugin version < 4.0.0.
+
 Update the `activity` entry in your `App_Resources/Android/AndroidManifest.xml` file:
 
 ```xml
@@ -60,20 +62,20 @@ Update the `activity` entry in your `App_Resources/Android/AndroidManifest.xml`
 
 So replace `com.tns.NativeScriptActivity` with `com.tns.NativeScriptNfcActivity`.
 
+#### Webpack (again, no longer needed from plugin version 4.0.0)
+If you're using Webpack to bundle your app you'll need to add 1 line of configuration in case you're targeting Android.
+
+- Open `webpack.config.js` (it's in the root of your project).
+- Look for an Array named `appComponents`, which likely contains stuff like `"tns-core-modules/ui/frame"`.
+- Add `resolve(__dirname, "node_modules/nativescript-nfc/nfc-activity.android.js")` [as shown here](https://github.com/EddyVerbruggen/nativescript-nfc/blob/6dfa0ff4f77cab5ab7f494ac3055f728ce51d131/demo/webpack.config.js#L17).
+
 ## Demo app (those screenshots above)
 Want to dive in quickly? Check out [the demo](https://github.com/EddyVerbruggen/nativescript-nfc/tree/master/demo)!
 
 You can run the demo app from the root of the project by typing `npm run demo.ios.device` or `npm run demo.android`.
 
 > [This is what it looks like in action on iOS](https://twitter.com/eddyverbruggen/status/899617497741185025)!
 
-## Webpack
-If you're using Webpack to bundle your app you'll need to add 1 line of configuration in case you're targeting Android.
-
-- Open `webpack.config.js` (it's in the root of your project).
-- Look for an Array named `appComponents`, which likely contains stuff like `"tns-core-modules/ui/frame"`.
-- Add `resolve(__dirname, "node_modules/nativescript-nfc/nfc-activity.android.js")` [as shown here](https://github.com/EddyVerbruggen/nativescript-nfc/blob/6dfa0ff4f77cab5ab7f494ac3055f728ce51d131/demo/webpack.config.js#L17).
-
 ## API
 
 ### `available`

diff --git a/demo/app/App_Resources/Android/AndroidManifest.xml b/demo/app/App_Resources/Android/AndroidManifest.xml
@@ -26,7 +26,7 @@
 		android:theme="@style/AppTheme">
 
 		<activity
-			android:name="com.tns.NativeScriptNfcActivity"
+			android:name="com.tns.NativeScriptActivity"
 			android:label="NFC"
 			android:configChanges="keyboardHidden|orientation|screenSize"
 			android:theme="@style/LaunchScreenTheme">

diff --git a/demo/package.json b/demo/package.json
@@ -2,16 +2,16 @@
   "nativescript": {
     "id": "org.nativescript.plugindemo.nfc",
     "tns-ios": {
-      "version": "5.3.1"
+      "version": "6.0.0-2019-06-10-154118-03"
     },
     "tns-android": {
-      "version": "5.3.1"
+      "version": "6.0.0-2019-06-11-172137-01"
     }
   },
   "dependencies": {
     "nativescript-nfc": "file:../src",
     "nativescript-theme-core": "~1.0.4",
-    "tns-core-modules": "~5.3.1"
+    "tns-core-modules": "6.0.0-next-2019-06-20-155941-01"
   },
   "devDependencies": {
     "babel-traverse": "6.26.0",
@@ -23,10 +23,9 @@
     "karma-jasmine": "^1.0.2",
     "karma-nativescript-launcher": "^0.4.0",
     "lazy": "1.0.11",
-    "nativescript-dev-typescript": "next",
     "nativescript-dev-webpack": "next",
     "nativescript-unit-test-runner": "^0.3.4",
-    "tns-platform-declarations": "~5.3.1",
-    "typescript": "~3.2.2"
+    "tns-platform-declarations": "next",
+    "typescript": "3.4.1"
   }
 }