Update dependencies, gradle

sokoloff06 · Jul 14, 2024 · 933b90f · 933b90f
1 parent f0e68a2
commit 933b90f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,14 +4,6 @@ plugins {
     // Google services Gradle plugin
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
-    id "org.sonarqube" version "4.4.1.3373"
-}
-
-sonar {
-    properties {
-        property "sonar.projectKey", "sokoloff06_com.google.firebaseengage_dce5994f-6c57-43c8-9b01-529ccfc9a480"
-        property "sonar.projectName", "com.google.firebaseengage"
-    }
 }
 
 android {
@@ -27,11 +19,11 @@ android {
             keyPassword secrets.getProperty('keyPassword')
         }
     }
-    compileSdkVersion 33
     defaultConfig {
         applicationId "com.google.firebaseengage"
         minSdkVersion 22
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 35
         versionCode 2
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -46,6 +38,10 @@ android {
     buildFeatures {
         viewBinding true
     }
+    compileOptions {
+        sourceCompatibility = 17
+        targetCompatibility = 17
+    }
 
     namespace 'com.google.firebaseengage'
 }
@@ -103,4 +99,4 @@ dependencies {
     androidTestImplementation "androidx.test:core:1.4.0"
 
     testImplementation "junit:junit:4.13.2"
-}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- Optional : -->
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <application
@@ -21,6 +22,10 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar"
         tools:ignore="GoogleAppIndexingWarning">
+        <property
+            android:name="android.adservices.AD_SERVICES_CONFIG"
+            android:resource="@xml/gma_ad_services_config"
+            tools:replace="android:resource" />
 
 
         <!--GA4 temporary disable analytics-->
@@ -33,10 +38,10 @@
 <!--        <meta-data-->
 <!--            android:name="google_analytics_tcf_data_enabled"-->
 <!--            android:value="true" />-->
-                <meta-data android:name="google_analytics_default_allow_ad_storage" android:value="false" />
-                <meta-data android:name="google_analytics_default_allow_analytics_storage" android:value="false" />
-                <meta-data android:name="google_analytics_default_allow_ad_user_data" android:value="false" />
-                <meta-data android:name="google_analytics_default_allow_ad_personalization" android:value="false" />
+                <meta-data android:name="google_analytics_default_allow_ad_storage" android:value="true" />
+                <meta-data android:name="google_analytics_default_allow_analytics_storage" android:value="true" />
+                <meta-data android:name="google_analytics_default_allow_ad_user_data" android:value="eu_consent_policy" />
+                <meta-data android:name="google_analytics_default_allow_ad_personalization_signals" android:value="eu_consent_policy" />
 
         <!-- Sample AdMob app ID: ca-app-pub-3940256099942544~3347511713 -->
         <meta-data
@@ -103,6 +108,7 @@
             </intent-filter>
         </activity> <!-- FCM Demo 1: Registering messaging service for messaging event -->
         <service
+            android:foregroundServiceType="dataSync"
             android:name=".firebase.MyFirebaseMessagingService"
             android:exported="false">
             <intent-filter>

diff --git a/build.gradle b/build.gradle
@@ -6,10 +6,10 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath 'com.google.gms:google-services:4.3.14'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:+"
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
+        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.google.gms:google-services:4.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/gradle.properties b/gradle.properties
@@ -14,7 +14,10 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -5,7 +5,7 @@
 
 #Sun Oct 02 13:44:37 IDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME