Merge pull request #805 from devemux86/android

Android 16
This commit is contained in:
afischerdev 2025-06-19 14:51:53 +02:00 committed by GitHub
commit 1642b4f5ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View file

@ -8,7 +8,7 @@ plugins {
}
android {
compileSdk 35
compileSdk 36
base {
archivesName = "BRouterApp." + project.version
@ -100,9 +100,9 @@ repositories {
}
dependencies {
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.appcompat:appcompat:1.7.1'
implementation "androidx.constraintlayout:constraintlayout:2.2.1"
implementation 'androidx.work:work-runtime:2.10.1'
implementation 'androidx.work:work-runtime:2.10.2'
implementation 'com.google.android.material:material:1.12.0'
implementation project(':brouter-mapaccess')
@ -115,7 +115,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation 'androidx.work:work-testing:2.10.1'
androidTestImplementation 'androidx.work:work-testing:2.10.2'
}
gradle.projectsEvaluated {

View file

@ -12,7 +12,7 @@ import java.util.Map;
import java.util.Random;
public class StackSampler extends Thread {
private DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS", new Locale("en", "US"));
private DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS", new Locale.Builder().setLanguage("en").setRegion("US").build());
private BufferedWriter bw;
private Random rand = new Random();