Skip to content

Commit

Permalink
Merge pull request #25 from Essent/feature/upgrade-ns-5
Browse files Browse the repository at this point in the history
Upgrade to NativeScript 5
  • Loading branch information
wytzen authored Feb 11, 2019
2 parents 28a60c8 + 80b8eaf commit c1568c1
Show file tree
Hide file tree
Showing 29 changed files with 4,654 additions and 5,931 deletions.
19 changes: 13 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
.vscode
.idea
.DS_Store
*.esm.json
*.js
*.js.map
*.log
!scripts/*.js
demo/app/*.js
src/*.d.ts
!src/index.d.ts
!src/references.d.ts
!src/scripts/*.js
!demo/karma.conf.js
!demo/app/tests/*.js
demo/*.d.ts
!demo/references.d.ts
demo/lib
demo/platforms
demo/node_modules
demo/typings
node_modules
.idea
.vscode
publish/src
publish/package
demo/report/report.html
demo/report/stats.json
!demo-vue/app/app.js
Empty file modified LICENSE
100644 → 100755
Empty file.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Based on:

Listen to lifecycle events:

```
```ts
import * as application from "application";
import {AdobeAnalytics} from "nativescript-adobe-marketing-cloud";

Expand Down Expand Up @@ -73,18 +73,18 @@ See: https://marketing.adobe.com/resources/help/en_US/mobile/ios/privacy.html
Select a privacy option:

Send Data Until Opt-Out
```
```ts
AdobeAnalytics.getInstance().optIn();
```
Hold Data Until Opt-In
```
```ts
AdobeAnalytics.getInstance().optOut();
```

## Visitor Tracking Between an App and Mobile Web
See: https://marketing.adobe.com/resources/help/en_US/mobile/ios/hybrid_app.html
You can call:
```
```ts
AdobeAnalytics.getInstance().visitorAppendToURL(url);
```

Expand Down Expand Up @@ -184,13 +184,13 @@ Ultimately after the issue in Angular CLI is fixed this would not be a restricti
````

*yourplugin.common.ts*
````
````ts
import * as app from 'application';
````

**RIGHT**

*yourplugin.common.ts*
````
````ts
import * as app from 'tns-core-modules/application';
````
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#1.6.0
Upgrade to NativeScript 5
New Android SDK 4.17.2
New iOS SDK 4.18.0

#1.5.1
Upgrade karma to 2.0.5 to resolve a security vulnerability
See: https://nvd.nist.gov/vuln/detail/CVE-2017-16113
Expand Down
4 changes: 2 additions & 2 deletions demo/karma.conf.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = function(config) {

// list of files / patterns to load in the browser
files: [
'app/**/*.js',
'app/**/*.js'
],


Expand Down Expand Up @@ -72,6 +72,6 @@ module.exports = function(config) {

// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
singleRun: false
singleRun: true
});
};
Loading

0 comments on commit c1568c1

Please sign in to comment.