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"
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" />

View file

@ -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'
apply plugin: 'com.google.gms.google-services'

View file

@ -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>
</manifest>

View file

@ -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'
apply plugin: 'com.google.gms.google-services'

View file

@ -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" />

View file

@ -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'
apply plugin: 'com.google.gms.google-services'

View file

@ -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" />

View file

@ -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
}
}
}