From 62041fa087176558eaeea6c41ed6b20f5ba19f6e Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 11 Dec 2016 13:05:39 +0100
Subject: [PATCH] Update manifest versions

---
 plugins/Osmand-Nautical/AndroidManifest.xml     |  2 +-
 plugins/Osmand-Nautical/build.gradle            | 17 ++++++++---------
 .../Osmand-ParkingPlugin/AndroidManifest.xml    |  4 ++--
 plugins/Osmand-ParkingPlugin/build.gradle       | 16 ++++++++--------
 plugins/Osmand-SRTMPlugin/AndroidManifest.xml   |  2 +-
 plugins/Osmand-SRTMPlugin/build.gradle          | 16 ++++++++--------
 plugins/Osmand-Skimaps/AndroidManifest.xml      |  2 +-
 plugins/Osmand-Skimaps/build.gradle             | 14 +++++++-------
 8 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/plugins/Osmand-Nautical/AndroidManifest.xml b/plugins/Osmand-Nautical/AndroidManifest.xml
index e99e2054e5..4c811ce82f 100644
--- a/plugins/Osmand-Nautical/AndroidManifest.xml
+++ b/plugins/Osmand-Nautical/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.osmand.nauticalPlugin"
     android:installLocation="auto"
-    android:versionCode="6"
+    android:versionCode="7"
     android:versionName="1.0" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />
diff --git a/plugins/Osmand-Nautical/build.gradle b/plugins/Osmand-Nautical/build.gradle
index 6b10503e13..7c8d303d13 100644
--- a/plugins/Osmand-Nautical/build.gradle
+++ b/plugins/Osmand-Nautical/build.gradle
@@ -11,13 +11,12 @@ android {
 			keyAlias "androiddebugkey"
 			keyPassword "android"
 		}
-
-		publishing {
-			storeFile file("../../osmand_key")
-			storePassword System.getenv("OSMAND_APK_PASSWORD")
-			keyAlias "androiddebugkey"
-			keyPassword System.getenv("OSMAND_APK_PASSWORD")
-		}
+		release {
+      			storeFile file(RELEASE_STORE_FILE)
+       			storePassword RELEASE_STORE_PASSWORD
+       		        keyAlias RELEASE_KEY_ALIAS
+                        keyPassword RELEASE_KEY_PASSWORD
+                }
 	}
 
 	defaultConfig {
@@ -48,7 +47,7 @@ android {
 			signingConfig signingConfigs.development
 		}
 		release {
-			signingConfig signingConfigs.publishing
+			signingConfig signingConfigs.release
 		}
 	}
 }
@@ -71,4 +70,4 @@ dependencies {
 }
 
 println "Apply GMS plugin"
-apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
+apply plugin: 'com.google.gms.google-services'
diff --git a/plugins/Osmand-ParkingPlugin/AndroidManifest.xml b/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
index 11d6e141ba..89e59782d4 100644
--- a/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
+++ b/plugins/Osmand-ParkingPlugin/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.osmand.parkingPlugin"
-    android:versionCode="6"
+    android:versionCode="7"
     android:versionName="1.0" >
 
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
@@ -22,4 +22,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/plugins/Osmand-ParkingPlugin/build.gradle b/plugins/Osmand-ParkingPlugin/build.gradle
index 69a40bef11..09c642fcc7 100644
--- a/plugins/Osmand-ParkingPlugin/build.gradle
+++ b/plugins/Osmand-ParkingPlugin/build.gradle
@@ -11,13 +11,13 @@ android {
 			keyAlias "androiddebugkey"
 			keyPassword "android"
 		}
+		release {
+                        storeFile file(RELEASE_STORE_FILE)
+                        storePassword RELEASE_STORE_PASSWORD
+                        keyAlias RELEASE_KEY_ALIAS
+                        keyPassword RELEASE_KEY_PASSWORD
+                }
 
-		publishing {
-			storeFile file("../../osmand_key")
-			storePassword System.getenv("OSMAND_APK_PASSWORD")
-			keyAlias "androiddebugkey"
-			keyPassword System.getenv("OSMAND_APK_PASSWORD")
-		}
 	}
 
 	defaultConfig {
@@ -47,7 +47,7 @@ android {
 			signingConfig signingConfigs.development
 		}
 		release {
-			signingConfig signingConfigs.publishing
+			signingConfig signingConfigs.release
 		}
 	}
 }
@@ -70,4 +70,4 @@ dependencies {
 }
 
 println "Apply GMS plugin"
-apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
+apply plugin: 'com.google.gms.google-services'
diff --git a/plugins/Osmand-SRTMPlugin/AndroidManifest.xml b/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
index 04cf42f492..f5fd40d03f 100644
--- a/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
+++ b/plugins/Osmand-SRTMPlugin/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.osmand.srtmPlugin.paid"
-    android:versionCode="6"
+    android:versionCode="7"
     android:versionName="1.0" >
 
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
diff --git a/plugins/Osmand-SRTMPlugin/build.gradle b/plugins/Osmand-SRTMPlugin/build.gradle
index b8447a1ee1..d4f5e0c215 100644
--- a/plugins/Osmand-SRTMPlugin/build.gradle
+++ b/plugins/Osmand-SRTMPlugin/build.gradle
@@ -11,13 +11,13 @@ android {
 			keyAlias "androiddebugkey"
 			keyPassword "android"
 		}
+		release {
+                        storeFile file(RELEASE_STORE_FILE)
+                        storePassword RELEASE_STORE_PASSWORD
+                        keyAlias RELEASE_KEY_ALIAS
+                        keyPassword RELEASE_KEY_PASSWORD
+                }
 
-		publishing {
-			storeFile file("../../osmand_key")
-			storePassword System.getenv("OSMAND_APK_PASSWORD")
-			keyAlias "androiddebugkey"
-			keyPassword System.getenv("OSMAND_APK_PASSWORD")
-		}
 	}
 
 	defaultConfig {
@@ -47,7 +47,7 @@ android {
 			signingConfig signingConfigs.development
 		}
 		release {
-			signingConfig signingConfigs.publishing
+			signingConfig signingConfigs.release
 		}
 	}
 }
@@ -70,4 +70,4 @@ dependencies {
 }
 
 println "Apply GMS plugin"
-apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
+apply plugin: 'com.google.gms.google-services'
diff --git a/plugins/Osmand-Skimaps/AndroidManifest.xml b/plugins/Osmand-Skimaps/AndroidManifest.xml
index a32abeae55..ad3442908b 100644
--- a/plugins/Osmand-Skimaps/AndroidManifest.xml
+++ b/plugins/Osmand-Skimaps/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.osmand.skimapsPlugin"
-    android:versionCode="6"
+    android:versionCode="7"
     android:versionName="1.0" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />
diff --git a/plugins/Osmand-Skimaps/build.gradle b/plugins/Osmand-Skimaps/build.gradle
index 48d2555a3a..fa42eeb773 100644
--- a/plugins/Osmand-Skimaps/build.gradle
+++ b/plugins/Osmand-Skimaps/build.gradle
@@ -11,13 +11,13 @@ android {
 			keyAlias "androiddebugkey"
 			keyPassword "android"
 		}
+		release {
+                        storeFile file(RELEASE_STORE_FILE)
+                        storePassword RELEASE_STORE_PASSWORD
+                        keyAlias RELEASE_KEY_ALIAS
+                        keyPassword RELEASE_KEY_PASSWORD
+                }
 
-		publishing {
-			storeFile file("../../osmand_key")
-			storePassword System.getenv("OSMAND_APK_PASSWORD")
-			keyAlias "androiddebugkey"
-			keyPassword System.getenv("OSMAND_APK_PASSWORD")
-		}
 	}
 
 	defaultConfig {
@@ -48,7 +48,7 @@ android {
 			signingConfig signingConfigs.development
 		}
 		release {
-			signingConfig signingConfigs.publishing
+			signingConfig signingConfigs.release
 		}
 	}
 }