diff --git a/app/build.gradle b/app/build.gradle index 9ef14bd..1bb2a13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { applicationId "com.odiousapps.weewxweather" minSdkVersion 23 - targetSdkVersion 33 - versionCode 1000013 - versionName "1.0.13" + targetSdkVersion 34 + versionCode 1000014 + versionName "1.0.14" } buildTypes { @@ -31,9 +31,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.google.android.material:material:1.7.0' - implementation 'androidx.appcompat:appcompat:1.6.0' - implementation 'androidx.core:core:1.9.0' + implementation 'com.google.android.material:material:1.10.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.core:core:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.github.smart-fun:XmlToJson:1.5.2' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 14c3429..41f5e5b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,8 @@ - + + { + runOnUiThread(() -> + { b1.setEnabled(true); b2.setEnabled(true); dialog.dismiss(); diff --git a/build.gradle b/build.gradle index deb30a7..a45445d 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:8.0.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 1afe7c2..bb1458d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,8 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.defaults.buildfeatures.buildconfig=true android.enableJetifier=true +android.nonFinalResIds=false +android.nonTransitiveRClass=false android.useAndroidX=true \ No newline at end of file