Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-12-11 13:06:11 +01:00
commit 574995eb15
8 changed files with 36 additions and 37 deletions

View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.osmand.nauticalPlugin" package="net.osmand.nauticalPlugin"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="6" android:versionCode="7"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" /> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />

View file

@ -11,12 +11,11 @@ android {
keyAlias "androiddebugkey" keyAlias "androiddebugkey"
keyPassword "android" keyPassword "android"
} }
release {
publishing { storeFile file(RELEASE_STORE_FILE)
storeFile file("../../osmand_key") storePassword RELEASE_STORE_PASSWORD
storePassword System.getenv("OSMAND_APK_PASSWORD") keyAlias RELEASE_KEY_ALIAS
keyAlias "androiddebugkey" keyPassword RELEASE_KEY_PASSWORD
keyPassword System.getenv("OSMAND_APK_PASSWORD")
} }
} }
@ -48,7 +47,7 @@ android {
signingConfig signingConfigs.development signingConfig signingConfigs.development
} }
release { release {
signingConfig signingConfigs.publishing signingConfig signingConfigs.release
} }
} }
} }

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.osmand.parkingPlugin" package="net.osmand.parkingPlugin"
android:versionCode="6" android:versionCode="7"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" /> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />

View file

@ -11,13 +11,13 @@ android {
keyAlias "androiddebugkey" keyAlias "androiddebugkey"
keyPassword "android" keyPassword "android"
} }
release {
publishing { storeFile file(RELEASE_STORE_FILE)
storeFile file("../../osmand_key") storePassword RELEASE_STORE_PASSWORD
storePassword System.getenv("OSMAND_APK_PASSWORD") keyAlias RELEASE_KEY_ALIAS
keyAlias "androiddebugkey" keyPassword RELEASE_KEY_PASSWORD
keyPassword System.getenv("OSMAND_APK_PASSWORD")
} }
} }
defaultConfig { defaultConfig {
@ -47,7 +47,7 @@ android {
signingConfig signingConfigs.development signingConfig signingConfigs.development
} }
release { release {
signingConfig signingConfigs.publishing signingConfig signingConfigs.release
} }
} }
} }

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.osmand.srtmPlugin.paid" package="net.osmand.srtmPlugin.paid"
android:versionCode="6" android:versionCode="7"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" /> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />

View file

@ -11,13 +11,13 @@ android {
keyAlias "androiddebugkey" keyAlias "androiddebugkey"
keyPassword "android" keyPassword "android"
} }
release {
publishing { storeFile file(RELEASE_STORE_FILE)
storeFile file("../../osmand_key") storePassword RELEASE_STORE_PASSWORD
storePassword System.getenv("OSMAND_APK_PASSWORD") keyAlias RELEASE_KEY_ALIAS
keyAlias "androiddebugkey" keyPassword RELEASE_KEY_PASSWORD
keyPassword System.getenv("OSMAND_APK_PASSWORD")
} }
} }
defaultConfig { defaultConfig {
@ -47,7 +47,7 @@ android {
signingConfig signingConfigs.development signingConfig signingConfigs.development
} }
release { release {
signingConfig signingConfigs.publishing signingConfig signingConfigs.release
} }
} }
} }

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.osmand.skimapsPlugin" package="net.osmand.skimapsPlugin"
android:versionCode="6" android:versionCode="7"
android:versionName="1.0" > android:versionName="1.0" >
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" /> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="16" />

View file

@ -11,13 +11,13 @@ android {
keyAlias "androiddebugkey" keyAlias "androiddebugkey"
keyPassword "android" keyPassword "android"
} }
release {
publishing { storeFile file(RELEASE_STORE_FILE)
storeFile file("../../osmand_key") storePassword RELEASE_STORE_PASSWORD
storePassword System.getenv("OSMAND_APK_PASSWORD") keyAlias RELEASE_KEY_ALIAS
keyAlias "androiddebugkey" keyPassword RELEASE_KEY_PASSWORD
keyPassword System.getenv("OSMAND_APK_PASSWORD")
} }
} }
defaultConfig { defaultConfig {
@ -48,7 +48,7 @@ android {
signingConfig signingConfigs.development signingConfig signingConfigs.development
} }
release { release {
signingConfig signingConfigs.publishing signingConfig signingConfigs.release
} }
} }
} }