Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3ed525b
Bump minSdk to 26
cbalster Sep 27, 2025
6dfee2a
Fix NPE on configuration change
cbalster Sep 27, 2025
d7e1d6d
Bump androidx libraries
cbalster Sep 27, 2025
5e9a14c
Bump okhttp
cbalster Sep 27, 2025
a0af3b9
Bump Dagger
cbalster Sep 27, 2025
7a8f973
Bump targetSdk
cbalster Sep 29, 2025
ed0c506
Merge remote-tracking branch 'upstream/master' into bump_minsdk
cbalster Sep 29, 2025
47d3afb
Bump test libs
cbalster Sep 29, 2025
ece21e7
Remove errorprone
cbalster Sep 29, 2025
1f12a8d
Migrate to nonTransitiveRClasses
cbalster Sep 29, 2025
d559bf4
Remove no longer needed build fix
cbalster Sep 29, 2025
9ae1d6d
Remove obsolete SDK differentiations
cbalster Oct 4, 2025
3cc365a
Migrate to onBackPressedCallback
cbalster Oct 4, 2025
fb81d6d
Remove more obsolete API level checks
cbalster Oct 4, 2025
32c4fb1
Cleanup and java level migration
cbalster Oct 4, 2025
3c3cbe0
Bump Gradle plugin
cbalster Oct 8, 2025
dc71c06
Simplify observer mode text layout
cbalster Nov 2, 2025
73a0b2b
Formatting
cbalster Nov 2, 2025
0041245
Rework drawer layout and inset handling
cbalster Nov 6, 2025
ddc2dc4
Bump okhttp
cbalster Nov 6, 2025
0cf862b
Deprecation
cbalster Nov 6, 2025
60c4245
Migrate from osmdroid to maplibre
cbalster Nov 9, 2025
503ea71
Set custom user agent
cbalster Nov 9, 2025
a54f940
Ignore warning about FGS declaration
cbalster Nov 9, 2025
6bf4d3f
Cleanup
cbalster Nov 9, 2025
2b9e52e
Cleanup strings
cbalster Nov 9, 2025
678bdaf
Uncomment styles still needed
cbalster Nov 9, 2025
d82aedc
Remove link to twitter and add link to instagram
cbalster Nov 9, 2025
f039a4e
Update license attributions
cbalster Nov 9, 2025
5bc1a5d
Update build files
cbalster Nov 9, 2025
f64b31a
Migrate gradle build files to kotlin
cbalster Nov 9, 2025
33b21f2
Bring back unmockplugin
cbalster Nov 9, 2025
6fb9841
Fix lint error classification
cbalster Nov 12, 2025
6b8c139
Fix fix
cbalster Nov 12, 2025
7f3ec72
Bump gradle plugin
cbalster Nov 12, 2025
3f9b977
Bump maplibre and okhttp
cbalster Nov 18, 2025
170687f
Update map attribution
cbalster Nov 18, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 0 additions & 120 deletions app/build.gradle

This file was deleted.

122 changes: 122 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
import java.util.Properties
import java.io.FileInputStream

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.unmock)
}

// Place actual signing configuration in "keystore.properties"
// "keystore.properties" is in .gitignore and will not be checked into repo
val keystorePropertiesFile = rootProject.file("keystore.properties").let {
if (it.exists()) it else rootProject.file("dummy_keystore.properties")
}
val keystoreProperties = Properties().apply {
load(FileInputStream(keystorePropertiesFile))
}

android {
namespace = "de.stephanlindauer.criticalmaps"

signingConfigs {
create("releaseConfig") {
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
storeFile = file(keystoreProperties["storeFile"] as String)
storePassword = keystoreProperties["storePassword"] as String
}
}

compileSdk {
version = release(36)
}

defaultConfig {
applicationId = "de.stephanlindauer.criticalmaps"
minSdk = 26
targetSdk = 36
versionCode = 50
versionName = "2.9.2"
vectorDrawables.useSupportLibrary = true

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments["disableAnalytics"] = "true"
}

buildTypes {
debug {
applicationIdSuffix = ".debug"
isPseudoLocalesEnabled = true
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
release {
isMinifyEnabled = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
signingConfig = signingConfigs["releaseConfig"]
}
}

packaging {
resources {
excludes += "META-INF/services/javax.annotation.processing.Processor"
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

buildFeatures {
viewBinding = true
buildConfig = true
}

lint {
warning.addAll(
listOf(
"MissingTranslation",
"StringFormatInvalid",
"NewApi",
"InvalidPackage"
)
)
}
}

dependencies {
implementation(libs.otto)
implementation(libs.maplibre)
implementation(libs.picasso)
implementation(libs.timber)
implementation(libs.okhttp)
implementation(libs.typed.preferences)
implementation(libs.material)
implementation(libs.androidx.core)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.annotation)
implementation(libs.androidx.exifinterface)
implementation(libs.androidx.constraintlayout)

implementation(libs.dagger)
annotationProcessor(libs.dagger.compiler)

debugImplementation(libs.leakcanary)

testImplementation(libs.junit)
testImplementation(libs.com.google.truth)
testImplementation(libs.org.mockito.core)

androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.test.core)
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.androidx.test.rules)
androidTestImplementation(libs.androidx.espresso.core)
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.stephanlindauer.criticalmaps;

import androidx.test.ext.junit.rules.ActivityScenarioRule;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;

import org.junit.Rule;
import org.junit.Test;
Expand All @@ -15,7 +15,7 @@
public class ApplicationTest {

@Rule
public ActivityTestRule<Main> mActivityRule = new ActivityTestRule<>(Main.class);
public ActivityScenarioRule<Main> mActivityRule = new ActivityScenarioRule<>(Main.class);

@Test
public void verifyAppLaunches() {
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="18" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"
tools:ignore="ForegroundServicesPolicy" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
<uses-permission
android:name="android.permission.POST_NOTIFICATIONS"
Expand Down
Loading