Skip to content
This repository has been archived by the owner on Sep 3, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release/2.12.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
federicoboschini committed Jun 7, 2019
2 parents f232d7d + bffcbaa commit a3a946f
Show file tree
Hide file tree
Showing 277 changed files with 12,388 additions and 344,110 deletions.
4 changes: 2 additions & 2 deletions hooks/after_prepare_android.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if (platformDir) {
root.find('application')
.append(apiKeyMeta)
} catch (e) {
throw new Error("! Can't inject `near_api_key` meta inside AndroidManifest.xml. This shouldn't happen, please contact us for support.\n")
throw new Error("! Can't inject `near_api_key` meta inside AndroidManifest.xml. Have you added Android platform?\n")
}
}

Expand Down Expand Up @@ -136,7 +136,7 @@ if (platformDir) {
testDevActivity.append(intentFilter)
root.find('application').append(testDevActivity)
} catch (e) {
console.log("! Can't inject `near_url_scheme` inside AndroidManifest.xml. This shouldn't happen, please contact us for support.\n")
console.log("! Can't inject `near_url_scheme` inside AndroidManifest.xml. Have you added Android platform?\n")
}
}
fs.writeFileSync(manifestFile, tempManifest.write({ indent: 4 }), 'utf-8');
Expand Down
2 changes: 1 addition & 1 deletion hooks/after_prepare_ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var plistFile = path.join(platformDir, projectName, projectName + '-Info.plist')

if (platformDir) {
if (!fs.existsSync(plistFile)) {
throw new Error("! Can't find the -Info.plist file. This shouldn't happen, please contact us for support.\n")
throw new Error("! Can't find the -Info.plist file. Have you added iOS platform?\n")
}

var urlScheme = lib.searchPreferenceByName(rootdir, 'android', 'near_url_scheme');
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-nearit",
"version": "2.11.3",
"version": "2.12.0",
"description": "Cordova plugin for NearIT SDK",
"author": {
"name": "Fabio Cigliano",
Expand Down
17 changes: 5 additions & 12 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-nearit"
name="NearIT"
version="2.11.3">
version="2.12.0">

<name>NearIT SDK</name>
<description>Cordova plugin for NearIT SDK</description>
Expand Down Expand Up @@ -72,18 +72,11 @@
https://github.com/nearit/Near-iOS-SDK
https://github.com/nearit/iOS-UI-Bindings
Supporting iOS 9.0 and later
iOS-SDK release 2.11.0
iOS-UI-Bindings release 2.11.3
iOS-SDK release 2.12.0
iOS-UI-Bindings release 2.12.0
-->
<pod name="NearITSDK"
configurations="release,debug"
git="https://github.com/nearit/iOS-SDK"
tag="2.11.0" />

<pod name="NearUIBinding"
configurations="release,debug"
git="https://github.com/nearit/iOS-UI-Bindings"
tag="2.11.3" />
<framework src="NearITSDK" type="podspec" spec="~> 2.12.0" />
<framework src="NearUIBinding" type="podspec" spec="~> 2.12.0" />

<config-file target="config.xml" parent="/*">
<feature name="NearIT">
Expand Down
3 changes: 0 additions & 3 deletions sample/.bowerrc

This file was deleted.

14 changes: 0 additions & 14 deletions sample/.editorconfig

This file was deleted.

28 changes: 27 additions & 1 deletion sample/.gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,34 @@
# Specifies intentionally untracked files to ignore when using Git
# http://git-scm.com/docs/gitignore

*~
*.sw[mnpcod]
*.log
*.tmp
*.tmp.*
log.txt
*.sublime-project
*.sublime-workspace
.vscode/
npm-debug.log*

.idea/
.ionic/
.sourcemaps/
.sass-cache/
.tmp/
.versions/
coverage/
www/
node_modules/
tmp/
temp/
platforms/
plugins/
plugins/android.json
plugins/ios.json
$RECYCLE.BIN/

google-services.json
.DS_Store
Thumbs.db
UserInterfaceState.xcuserstate
200 changes: 200 additions & 0 deletions sample/angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
{
"$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
"version": 1,
"defaultProject": "app",
"newProjectRoot": "projects",
"projects": {
"app": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "www",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
{
"glob": "**/*",
"input": "src/assets",
"output": "assets"
},
{
"glob": "**/*.svg",
"input": "node_modules/ionicons/dist/ionicons/svg",
"output": "./svg"
}
],
"styles": [
{
"input": "src/theme/variables.scss"
},
{
"input": "src/global.scss"
},
{
"input": "src/app/app.scss"
}
],
"scripts": [],
"es5BrowserSupport": true
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
},
"ci": {
"progress": false
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "app:build"
},
"configurations": {
"production": {
"browserTarget": "app:build:production"
},
"ci": {
"progress": false
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "app:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [],
"scripts": [],
"assets": [
{
"glob": "favicon.ico",
"input": "src/",
"output": "/"
},
{
"glob": "**/*",
"input": "src/assets",
"output": "/assets"
}
]
},
"configurations": {
"ci": {
"progress": false,
"watch": false
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
"exclude": ["**/node_modules/**"]
}
},
"ionic-cordova-build": {
"builder": "@ionic/angular-toolkit:cordova-build",
"options": {
"browserTarget": "app:build"
},
"configurations": {
"production": {
"browserTarget": "app:build:production"
}
}
},
"ionic-cordova-serve": {
"builder": "@ionic/angular-toolkit:cordova-serve",
"options": {
"cordovaBuildTarget": "app:ionic-cordova-build",
"devServerTarget": "app:serve"
},
"configurations": {
"production": {
"cordovaBuildTarget": "app:ionic-cordova-build:production",
"devServerTarget": "app:serve:production"
}
}
}
}
},
"app-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "app:serve"
},
"configurations": {
"production": {
"devServerTarget": "app:serve:production"
},
"ci": {
"devServerTarget": "app:serve:ci"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": ["**/node_modules/**"]
}
}
}
}
},
"cli": {
"defaultCollection": "@ionic/angular-toolkit"
},
"schematics": {
"@ionic/angular-toolkit:component": {
"styleext": "scss"
},
"@ionic/angular-toolkit:page": {
"styleext": "scss"
}
}
}
7 changes: 0 additions & 7 deletions sample/bower.json

This file was deleted.

Loading

0 comments on commit a3a946f

Please sign in to comment.