Merge pull request #7 from CanalTP/release-1.1.0

🚀 Release 1.1.0
hove-io · Feb 7, 2018 · ddfdf83 · ddfdf83
2 parents 88333ef + a9e4282
commit ddfdf83
Show file tree

Hide file tree

Showing 9 changed files with 10,286 additions and 3,681 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "CanalTP/NavitiaSDK_ios" ~> 1.0
+github "CanalTP/NavitiaSDK_ios" ~> 1.1.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +0,0 @@
-github "Alamofire/Alamofire" "4.6.0"
-github "CanalTP/NavitiaSDK_ios" "1.0.0"
-github "Hearst-DD/ObjectMapper" "2.2.9"
-github "tristanhimmelman/AlamofireObjectMapper" "4.1.0"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-navitia-sdk",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Cordova plugin for NavitiaSDK iOS & Android",
   "cordova": {
     "id": "org-kisio-plugins-navitia-sdk",

diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-navitia-sdk" version="1.0.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="cordova-plugin-navitia-sdk" version="1.1.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>NavitiaSDK</name>
 
     <js-module name="NavitiaSDK" src="www/NavitiaSDK.js">
@@ -35,4 +35,4 @@
 
         <source-file src="src/android/org/kisio/CDVNavitiaSDK/CDVNavitiaSDK.java" target-dir="src/org/kisio/CDVNavitiaSDK" />
     </platform>
-</plugin>
+</plugin>
diff --git a/scripts/ios/carthage.js b/scripts/ios/carthage.js
@@ -34,4 +34,4 @@ module.exports = function(ctx) {
     });
 
     return deferral.promise;
-};
+};
diff --git a/src/android/build.gradle b/src/android/build.gradle
@@ -6,5 +6,5 @@ repositories {
 }
 
 dependencies {
-    compile 'org.kisio.sdk:navitia-sdk:0.3.0'
-}
+    compile 'org.kisio.sdk:navitia-sdk:1.0.0'
+}
diff --git a/src/android/org/kisio/CDVNavitiaSDK/CDVNavitiaSDK.java b/src/android/org/kisio/CDVNavitiaSDK/CDVNavitiaSDK.java
diff --git a/src/ios/CDVNavitiaSDK.swift b/src/ios/CDVNavitiaSDK.swift
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "CanalTP/NavitiaSDK_ios" ~> 1.0
		github "CanalTP/NavitiaSDK_ios" ~> 1.1.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,4 +34,4 @@ module.exports = function(ctx) { @@
         });
         return deferral.promise;
-    };
+    };