Compare commits

..

9 Commits
0.3.0 ... 0.3.1

Author SHA1 Message Date
johan12345
91b3234a45 fix URL of sonatype snapshots repo 2020-08-12 08:23:16 +02:00
johan12345
ab7cbc981b fix URL of sonatype snapshots repo 2020-08-12 08:12:02 +02:00
johan12345
a2c1a2cf82 move signingConfigs configuration for F-Droid 2020-08-11 20:10:14 +02:00
johan12345
167ede4e62 Release 0.3.1 2020-08-11 19:41:38 +02:00
johan12345
63900996e7 update .gitignore 2020-08-11 19:41:05 +02:00
johan12345
c626f3d5a5 update AnyMaps (fixes crash) 2020-08-11 19:40:22 +02:00
johan12345
8779e65846 set default map provider in google flavor back to google 2020-08-11 19:23:34 +02:00
johan12345
0c8bf84e56 adjust signingConfig configuration for compatibility with F-Droid 2020-08-11 19:18:46 +02:00
johan12345
90972cf933 fix lint errors 2020-08-10 20:49:18 +02:00
6 changed files with 19 additions and 18 deletions

3
.gitignore vendored
View File

@@ -8,5 +8,6 @@
.externalNativeBuild
.cxx
apikeys.xml
/app/release/app-release.aab
/app/**/*.aab
/app/**/*.apk
/_img/connectors/*.ai

View File

@@ -13,14 +13,23 @@ android {
applicationId "net.vonforst.evmap"
minSdkVersion 21
targetSdkVersion 29
versionCode 21
versionName "0.3.0"
versionCode 22
versionName "0.3.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
signingConfigs {
release
release {
def isRunningOnTravis = System.getenv("CI") == "true"
if (isRunningOnTravis) {
// configure keystore
storeFile = file("../_ci/keystore.jks")
storePassword = System.getenv("keystore_password")
keyAlias = System.getenv("keystore_alias")
keyPassword = System.getenv("keystore_alias_password")
}
}
}
buildTypes {
@@ -47,15 +56,6 @@ android {
}
}
def isRunningOnTravis = System.getenv("CI") == "true"
if (isRunningOnTravis) {
// configure keystore
signingConfigs.release.storeFile = file("../_ci/keystore.jks")
signingConfigs.release.storePassword = System.getenv("keystore_password")
signingConfigs.release.keyAlias = System.getenv("keystore_alias")
signingConfigs.release.keyPassword = System.getenv("keystore_alias_password")
}
compileOptions {
coreLibraryDesugaringEnabled true
targetCompatibility = JavaVersion.VERSION_1_8
@@ -116,7 +116,7 @@ dependencies {
implementation 'com.mapzen.android:lost:3.0.2'
// AnyMaps
def anyMapsVersion = 'cc2a044656'
def anyMapsVersion = 'e6e014dd11'
implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"

View File

@@ -8,6 +8,6 @@
<item>google</item>
<item>mapbox</item>
</string-array>
<string name="pref_map_provider_default" translatable="false">mapbox</string>
<string name="pref_map_provider_default" translatable="false">google</string>
<string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 30% off every donation.</string>
</resources>

View File

@@ -41,7 +41,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:contentDescription="@{item.contentDescription}"
android:tint="?colorPrimary"
app:tint="?colorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@{item.icon}"

View File

@@ -47,7 +47,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:contentDescription="@{item.contentDescription}"
android:tint="?colorPrimary"
app:tint="?colorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@{item.icon}"

View File

@@ -25,7 +25,7 @@ allprojects {
google()
jcenter()
maven { url 'https://jitpack.io' }
maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
flatDir {
dirs 'libs'
}