[fix] fixes build process.

SecUSo · May 27, 2024 · 1d3dc65 · 1d3dc65
1 parent a0c4193
commit 1d3dc65
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 29 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,6 +5,7 @@ def keysFile = rootProject.file('keys.properties')
 android {
 
     compileSdk 34
+    namespace "org.secuso.privacyfriendlyweather"
 
     defaultConfig {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -13,6 +14,7 @@ android {
         targetSdkVersion 34
         versionCode 18
         versionName "3.1.2"
+        multiDexEnabled = true
 
         if (keysFile.exists()) {
             def keys = new Properties()
@@ -66,6 +68,10 @@ android {
         }
     }
 
+    buildFeatures {
+        buildConfig true
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -109,4 +115,7 @@ dependencies {
     implementation "androidx.work:work-runtime:$work_version"
     implementation "androidx.work:work-runtime-ktx:$work_version"
     androidTestImplementation "androidx.work:work-testing:$work_version"
+
+    def multidex_version = "2.0.1"
+    implementation("androidx.multidex:multidex:$multidex_version")
 }
diff --git a/app/src/main/java/org/secuso/privacyfriendlyweather/PFAWeatherApplication.java b/app/src/main/java/org/secuso/privacyfriendlyweather/PFAWeatherApplication.java
@@ -1,17 +1,17 @@
 package org.secuso.privacyfriendlyweather;
 
-import android.app.Application;
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.multidex.MultiDexApplication;
 import androidx.work.Configuration;
 
 import org.secuso.privacyfriendlybackup.api.pfa.BackupManager;
 import org.secuso.privacyfriendlyweather.backup.BackupCreator;
 import org.secuso.privacyfriendlyweather.backup.BackupRestorer;
 
 
-public class PFAWeatherApplication extends Application implements Configuration.Provider {
+public class PFAWeatherApplication extends MultiDexApplication implements Configuration.Provider {
 
     @Override
     public void onCreate() {

diff --git a/app/src/main/java/org/secuso/privacyfriendlyweather/widget/WeatherWidget.java b/app/src/main/java/org/secuso/privacyfriendlyweather/widget/WeatherWidget.java
@@ -85,12 +85,7 @@ public static void updateView(Context context, AppWidgetManager appWidgetManager
 
         Intent intent = new Intent(context, ForecastCityActivity.class);
         intent.putExtra("cityId", city.getCityId());
-        PendingIntent pendingIntent;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
-        } else {
-            pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, 0);
-        }
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
 
         views.setOnClickPendingIntent(R.id.widget1day_layout, pendingIntent);
 

diff --git a/app/src/main/java/org/secuso/privacyfriendlyweather/widget/WeatherWidgetFiveDayForecast.java b/app/src/main/java/org/secuso/privacyfriendlyweather/widget/WeatherWidgetFiveDayForecast.java
@@ -148,12 +148,7 @@ public static void updateView(Context context, AppWidgetManager appWidgetManager
 
         Intent intent = new Intent(context, ForecastCityActivity.class);
         intent.putExtra("cityId", city.getCityId());
-        PendingIntent pendingIntent;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
-        } else {
-            pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, 0);
-        }
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
 
         views.setOnClickPendingIntent(R.id.widget5day_layout, pendingIntent);
         // Instruct the widget manager to update the widget

diff --git a/app/src/main/java/org/secuso/privacyfriendlyweather/widget/WeatherWidgetOneDayForecast.java b/app/src/main/java/org/secuso/privacyfriendlyweather/widget/WeatherWidgetOneDayForecast.java
@@ -133,12 +133,8 @@ public static void updateView(Context context, AppWidgetManager appWidgetManager
 
         Intent intent = new Intent(context, ForecastCityActivity.class);
         intent.putExtra("cityId", city.getCityId());
-        PendingIntent pendingIntent;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
-        } else {
-            pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, 0);
-        }
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
+
 
         views.setOnClickPendingIntent(R.id.widget1day_layout, pendingIntent);
         // Instruct the widget manager to update the widget

diff --git a/...src/main/java/org/secuso/privacyfriendlyweather/widget/WeatherWidgetThreeDayForecast.java b/...src/main/java/org/secuso/privacyfriendlyweather/widget/WeatherWidgetThreeDayForecast.java
@@ -137,12 +137,7 @@ public static void updateView(Context context, AppWidgetManager appWidgetManager
 
         Intent intent = new Intent(context, ForecastCityActivity.class);
         intent.putExtra("cityId", city.getCityId());
-        PendingIntent pendingIntent;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-            pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
-        } else {
-            pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, 0);
-        }
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, appWidgetId, intent, PendingIntent.FLAG_IMMUTABLE);
 
         views.setOnClickPendingIntent(R.id.widget3day_layout, pendingIntent);
 

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
@@ -14,4 +14,6 @@
 # org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip