Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
574995eb15
8 changed files with 36 additions and 37 deletions
|
@ -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" />
|
||||||
|
|
|
@ -11,13 +11,12 @@ 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 +47,7 @@ android {
|
||||||
signingConfig signingConfigs.development
|
signingConfig signingConfigs.development
|
||||||
}
|
}
|
||||||
release {
|
release {
|
||||||
signingConfig signingConfigs.publishing
|
signingConfig signingConfigs.release
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -71,4 +70,4 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
println "Apply GMS plugin"
|
println "Apply GMS plugin"
|
||||||
apply plugin: 'com.google.gms.google-services'
|
apply plugin: 'com.google.gms.google-services'
|
||||||
|
|
|
@ -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" />
|
||||||
|
@ -22,4 +22,4 @@
|
||||||
</activity>
|
</activity>
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
|
@ -11,13 +11,13 @@ android {
|
||||||
keyAlias "androiddebugkey"
|
keyAlias "androiddebugkey"
|
||||||
keyPassword "android"
|
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 {
|
defaultConfig {
|
||||||
|
@ -47,7 +47,7 @@ android {
|
||||||
signingConfig signingConfigs.development
|
signingConfig signingConfigs.development
|
||||||
}
|
}
|
||||||
release {
|
release {
|
||||||
signingConfig signingConfigs.publishing
|
signingConfig signingConfigs.release
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,4 +70,4 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
println "Apply GMS plugin"
|
println "Apply GMS plugin"
|
||||||
apply plugin: 'com.google.gms.google-services'
|
apply plugin: 'com.google.gms.google-services'
|
||||||
|
|
|
@ -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" />
|
||||||
|
|
|
@ -11,13 +11,13 @@ android {
|
||||||
keyAlias "androiddebugkey"
|
keyAlias "androiddebugkey"
|
||||||
keyPassword "android"
|
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 {
|
defaultConfig {
|
||||||
|
@ -47,7 +47,7 @@ android {
|
||||||
signingConfig signingConfigs.development
|
signingConfig signingConfigs.development
|
||||||
}
|
}
|
||||||
release {
|
release {
|
||||||
signingConfig signingConfigs.publishing
|
signingConfig signingConfigs.release
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,4 +70,4 @@ dependencies {
|
||||||
}
|
}
|
||||||
|
|
||||||
println "Apply GMS plugin"
|
println "Apply GMS plugin"
|
||||||
apply plugin: 'com.google.gms.google-services'
|
apply plugin: 'com.google.gms.google-services'
|
||||||
|
|
|
@ -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" />
|
||||||
|
|
|
@ -11,13 +11,13 @@ android {
|
||||||
keyAlias "androiddebugkey"
|
keyAlias "androiddebugkey"
|
||||||
keyPassword "android"
|
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 {
|
defaultConfig {
|
||||||
|
@ -48,7 +48,7 @@ android {
|
||||||
signingConfig signingConfigs.development
|
signingConfig signingConfigs.development
|
||||||
}
|
}
|
||||||
release {
|
release {
|
||||||
signingConfig signingConfigs.publishing
|
signingConfig signingConfigs.release
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue