Skip to content

Commit 87a8aa8

Browse files
authored
Merge pull request criticalmaps#354 from cbalster/migrate_to_maplibre
Migrate to maplibre
2 parents 6fb4e38 + 170687f commit 87a8aa8

File tree

75 files changed

+6946
-1436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+6946
-1436
lines changed

app/build.gradle

Lines changed: 0 additions & 120 deletions
This file was deleted.

app/build.gradle.kts

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
import java.util.Properties
2+
import java.io.FileInputStream
3+
4+
plugins {
5+
alias(libs.plugins.android.application)
6+
alias(libs.plugins.unmock)
7+
}
8+
9+
// Place actual signing configuration in "keystore.properties"
10+
// "keystore.properties" is in .gitignore and will not be checked into repo
11+
val keystorePropertiesFile = rootProject.file("keystore.properties").let {
12+
if (it.exists()) it else rootProject.file("dummy_keystore.properties")
13+
}
14+
val keystoreProperties = Properties().apply {
15+
load(FileInputStream(keystorePropertiesFile))
16+
}
17+
18+
android {
19+
namespace = "de.stephanlindauer.criticalmaps"
20+
21+
signingConfigs {
22+
create("releaseConfig") {
23+
keyAlias = keystoreProperties["keyAlias"] as String
24+
keyPassword = keystoreProperties["keyPassword"] as String
25+
storeFile = file(keystoreProperties["storeFile"] as String)
26+
storePassword = keystoreProperties["storePassword"] as String
27+
}
28+
}
29+
30+
compileSdk {
31+
version = release(36)
32+
}
33+
34+
defaultConfig {
35+
applicationId = "de.stephanlindauer.criticalmaps"
36+
minSdk = 26
37+
targetSdk = 36
38+
versionCode = 50
39+
versionName = "2.9.2"
40+
vectorDrawables.useSupportLibrary = true
41+
42+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
43+
testInstrumentationRunnerArguments["disableAnalytics"] = "true"
44+
}
45+
46+
buildTypes {
47+
debug {
48+
applicationIdSuffix = ".debug"
49+
isPseudoLocalesEnabled = true
50+
isMinifyEnabled = false
51+
proguardFiles(
52+
getDefaultProguardFile("proguard-android-optimize.txt"),
53+
"proguard-rules.pro"
54+
)
55+
}
56+
release {
57+
isMinifyEnabled = true
58+
proguardFiles(
59+
getDefaultProguardFile("proguard-android-optimize.txt"),
60+
"proguard-rules.pro"
61+
)
62+
signingConfig = signingConfigs["releaseConfig"]
63+
}
64+
}
65+
66+
packaging {
67+
resources {
68+
excludes += "META-INF/services/javax.annotation.processing.Processor"
69+
}
70+
}
71+
72+
compileOptions {
73+
sourceCompatibility = JavaVersion.VERSION_11
74+
targetCompatibility = JavaVersion.VERSION_11
75+
}
76+
77+
buildFeatures {
78+
viewBinding = true
79+
buildConfig = true
80+
}
81+
82+
lint {
83+
warning.addAll(
84+
listOf(
85+
"MissingTranslation",
86+
"StringFormatInvalid",
87+
"NewApi",
88+
"InvalidPackage"
89+
)
90+
)
91+
}
92+
}
93+
94+
dependencies {
95+
implementation(libs.otto)
96+
implementation(libs.maplibre)
97+
implementation(libs.picasso)
98+
implementation(libs.timber)
99+
implementation(libs.okhttp)
100+
implementation(libs.typed.preferences)
101+
implementation(libs.material)
102+
implementation(libs.androidx.core)
103+
implementation(libs.androidx.appcompat)
104+
implementation(libs.androidx.annotation)
105+
implementation(libs.androidx.exifinterface)
106+
implementation(libs.androidx.constraintlayout)
107+
108+
implementation(libs.dagger)
109+
annotationProcessor(libs.dagger.compiler)
110+
111+
debugImplementation(libs.leakcanary)
112+
113+
testImplementation(libs.junit)
114+
testImplementation(libs.com.google.truth)
115+
testImplementation(libs.org.mockito.core)
116+
117+
androidTestImplementation(libs.androidx.junit)
118+
androidTestImplementation(libs.androidx.test.core)
119+
androidTestImplementation(libs.androidx.test.runner)
120+
androidTestImplementation(libs.androidx.test.rules)
121+
androidTestImplementation(libs.androidx.espresso.core)
122+
}

app/src/androidTest/java/de/stephanlindauer/criticalmaps/ApplicationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package de.stephanlindauer.criticalmaps;
22

3+
import androidx.test.ext.junit.rules.ActivityScenarioRule;
34
import androidx.test.filters.LargeTest;
4-
import androidx.test.rule.ActivityTestRule;
55

66
import org.junit.Rule;
77
import org.junit.Test;
@@ -15,7 +15,7 @@
1515
public class ApplicationTest {
1616

1717
@Rule
18-
public ActivityTestRule<Main> mActivityRule = new ActivityTestRule<>(Main.class);
18+
public ActivityScenarioRule<Main> mActivityRule = new ActivityScenarioRule<>(Main.class);
1919

2020
@Test
2121
public void verifyAppLaunches() {

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
88
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
99
<uses-permission android:name="android.permission.INTERNET" />
10-
<uses-permission
11-
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
12-
android:maxSdkVersion="18" />
13-
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
10+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"
11+
tools:ignore="ForegroundServicesPolicy" />
1412
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
1513
<uses-permission
1614
android:name="android.permission.POST_NOTIFICATIONS"

0 commit comments

Comments
 (0)