chore: update dependencies and target api 34

arch10 · Dec 24, 2023 · 5f4b8b2 · 5f4b8b2
1 parent 438db8e
commit 5f4b8b2
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 67 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
     id 'com.google.firebase.crashlytics'
     id 'com.google.firebase.firebase-perf'
     id "com.google.gms.google-services"
-    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
 }
 
 def versionPropertiesFile = rootProject.file("version.properties")
 
-task bumpVersionCode {
+tasks.register('bumpVersionCode') {
     doLast {
         def versionProperties = new Properties()
         versionProperties.load(new FileInputStream(versionPropertiesFile))
@@ -22,7 +22,7 @@ task bumpVersionCode {
     }
 }
 
-task printVersionName {
+tasks.register('printVersionName') {
     doLast {
         println android.defaultConfig.versionName
     }
@@ -35,14 +35,12 @@ android {
         versionProperties.load(new FileInputStream(versionPropertiesFile))
     }
 
-    compileSdkVersion 33
-    buildToolsVersion '33.0.2'
-
     namespace 'com.gigaworks.tech.calculator'
     defaultConfig {
         applicationId "com.gigaworks.tech.calculator"
         minSdkVersion 21
-        targetSdkVersion 33
+        compileSdk 34
+        targetSdkVersion 34
         versionCode versionProperties['VERSION_CODE'].toInteger()
         versionName "2.2.0"
         buildConfigField "java.util.Date", "buildTime", "new java.util.Date(" + System.currentTimeMillis() + "L)"
@@ -69,23 +67,17 @@ android {
         enableAggregatingTask = true
     }
 
-    configurations.all {
-        exclude group: 'com.google.android.gms', module: 'play-services-ads'
-        exclude group: 'com.google.android.gms', module: 'play-services-ads-identifier'
-        exclude group: 'com.google.android.gms', module: 'play-services-ads-lite'
-    }
-
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.10.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
     // navigation
-    def navVersion = "2.5.3"
+    def navVersion = "2.7.6"
     implementation "androidx.navigation:navigation-fragment-ktx:$navVersion"
     implementation "androidx.navigation:navigation-ui-ktx:$navVersion"
 
@@ -95,13 +87,13 @@ dependencies {
 
     // Hilt dependencies
     implementation "com.google.dagger:hilt-android:$hilt_version"
-    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
+    ksp "com.google.dagger:hilt-android-compiler:$hilt_version"
 
     // ktx extensions
-    implementation 'androidx.activity:activity-ktx:1.7.1'
+    implementation 'androidx.activity:activity-ktx:1.8.2'
 
     // viewModel
-    def viewModelVersion = "2.6.1"
+    def viewModelVersion = "2.6.2"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$viewModelVersion"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$viewModelVersion"
 
@@ -110,19 +102,19 @@ dependencies {
     implementation "com.getkeepsafe.taptargetview:taptargetview:$tapTargetVersion"
 
     // custom tabs
-    implementation "androidx.browser:browser:1.5.0"
+    implementation "androidx.browser:browser:1.7.0"
 
     // firebase
-    implementation platform('com.google.firebase:firebase-bom:32.0.0')
+    implementation platform('com.google.firebase:firebase-bom:32.7.0')
     implementation 'com.google.firebase:firebase-crashlytics-ktx'
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'com.google.firebase:firebase-perf-ktx'
 
     // room
-    def roomVersion = "2.5.1"
+    def roomVersion = "2.6.1"
     implementation "androidx.room:room-runtime:$roomVersion"
     implementation "androidx.room:room-ktx:$roomVersion"
-    kapt "androidx.room:room-compiler:$roomVersion"
+    ksp "androidx.room:room-compiler:$roomVersion"
 
     // google play core
     implementation("com.google.android.play:core:1.10.3")

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,13 +3,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <meta-data
-        android:name="google_analytics_adid_collection_enabled"
-        android:value="false" />
-    <meta-data
-        android:name="google_analytics_default_allow_ad_personalization_signals"
-        android:value="false" />
-
     <queries>
         <intent>
             <action android:name="android.intent.action.SENDTO" />

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -130,13 +130,13 @@
                     android:layout_marginEnd="@dimen/space_l"
                     android:gravity="top"
                     android:paddingTop="2dp"
-                    tools:text="International"
                     android:textAppearance="@style/TextAppearance.CalculatorPlus.Body2"
                     android:textColor="?attr/textDisable"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/numberSeparator" />
+                    app:layout_constraintTop_toBottomOf="@+id/numberSeparator"
+                    tools:text="International" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -171,13 +171,13 @@
                     android:layout_marginEnd="@dimen/space_l"
                     android:gravity="top"
                     android:paddingTop="2dp"
-                    tools:text="Precision: 6"
                     android:textAppearance="@style/TextAppearance.CalculatorPlus.Body2"
                     android:textColor="?attr/textDisable"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/precision" />
+                    app:layout_constraintTop_toBottomOf="@+id/precision"
+                    tools:text="Precision: 6" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -248,12 +248,12 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="@dimen/space_l"
+                    android:contentDescription="@string/theme"
                     android:src="@drawable/brightness"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?attr/textPrimary"
-                    android:contentDescription="@string/theme" />
+                    app:tint="?attr/textPrimary" />
 
                 <TextView
                     android:id="@+id/theme"
@@ -301,12 +301,12 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="@dimen/space_l"
+                    android:contentDescription="@string/accent_color"
                     android:src="@drawable/palette"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?attr/textPrimary"
-                    android:contentDescription="@string/accent_color" />
+                    app:tint="?attr/textPrimary" />
 
                 <TextView
                     android:id="@+id/color"
@@ -331,13 +331,13 @@
                     android:layout_marginEnd="@dimen/space_l"
                     android:gravity="top"
                     android:paddingTop="2dp"
-                    tools:text="Blue"
                     android:textAppearance="@style/TextAppearance.CalculatorPlus.Body2"
                     android:textColor="?attr/textDisable"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/colorIcon"
-                    app:layout_constraintTop_toBottomOf="@+id/color" />
+                    app:layout_constraintTop_toBottomOf="@+id/color"
+                    tools:text="Blue" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -367,12 +367,12 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="@dimen/space_l"
+                    android:contentDescription="@string/share"
                     android:src="@drawable/share"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?attr/textPrimary"
-                    android:contentDescription="@string/share" />
+                    app:tint="?attr/textPrimary" />
 
                 <TextView
                     android:id="@+id/share"
@@ -420,12 +420,12 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="@dimen/space_l"
+                    android:contentDescription="@string/rate"
                     android:src="@drawable/star"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?attr/textPrimary"
-                    android:contentDescription="@string/rate" />
+                    app:tint="?attr/textPrimary" />
 
                 <TextView
                     android:id="@+id/rate"
@@ -473,12 +473,12 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="@dimen/space_l"
+                    android:contentDescription="@string/bug"
                     android:src="@drawable/bug"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?attr/textPrimary"
-                    android:contentDescription="@string/bug" />
+                    app:tint="?attr/textPrimary" />
 
                 <TextView
                     android:id="@+id/bug"
@@ -526,12 +526,12 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="@dimen/space_l"
+                    android:contentDescription="@string/contact"
                     android:src="@drawable/mail"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?attr/textPrimary"
-                    android:contentDescription="@string/contact" />
+                    app:tint="?attr/textPrimary" />
 
                 <TextView
                     android:id="@+id/contact"
@@ -579,12 +579,12 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="@dimen/space_l"
+                    android:contentDescription="@string/follow"
                     android:src="@drawable/twitter"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?attr/textPrimary"
-                    android:contentDescription="@string/follow" />
+                    app:tint="?attr/textPrimary" />
 
                 <TextView
                     android:id="@+id/follow"
@@ -632,12 +632,12 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_marginStart="@dimen/space_l"
+                    android:contentDescription="@string/title_activity_about"
                     android:src="@drawable/alert_circle"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:tint="?attr/textPrimary"
-                    android:contentDescription="@string/title_activity_about" />
+                    app:tint="?attr/textPrimary" />
 
                 <TextView
                     android:id="@+id/about"
@@ -662,13 +662,13 @@
                     android:layout_marginEnd="@dimen/space_l"
                     android:gravity="top"
                     android:paddingTop="2dp"
-                    tools:text="Version: 2.0.0"
                     android:textAppearance="@style/TextAppearance.CalculatorPlus.Body2"
                     android:textColor="?attr/textDisable"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/aboutIcon"
-                    app:layout_constraintTop_toBottomOf="@+id/about" />
+                    app:layout_constraintTop_toBottomOf="@+id/about"
+                    tools:text="Version: 2.0.0" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
         </LinearLayout>

diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
@@ -75,7 +75,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
                 android:layout_marginTop="@dimen/space_xl"
-                app:cardElevation="4dp"
                 android:visibility="gone"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
@@ -118,9 +117,9 @@
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
-                app:cardElevation="4dp"
                 android:layout_marginTop="@dimen/space_xl"
                 android:background="?attr/selectableItemBackground"
+                app:cardCornerRadius="0dp"
                 android:clickable="true"
                 android:focusable="true">
 
@@ -161,8 +160,8 @@
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
-                app:cardElevation="4dp"
                 android:background="?attr/selectableItemBackground"
+                app:cardCornerRadius="0dp"
                 android:clickable="true"
                 android:focusable="true">
 
@@ -203,8 +202,8 @@
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
-                app:cardElevation="4dp"
                 android:background="?attr/selectableItemBackground"
+                app:cardCornerRadius="0dp"
                 android:clickable="true"
                 android:focusable="true">
 
@@ -246,8 +245,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="56dp"
                 android:layout_marginBottom="@dimen/space_xl"
-                app:cardElevation="4dp"
                 android:background="?attr/selectableItemBackground"
+                app:cardCornerRadius="0dp"
                 android:clickable="true"
                 android:focusable="true">
 

diff --git a/build.gradle b/build.gradle
@@ -1,31 +1,35 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.8.10'
-    ext.hilt_version = '2.45'
+    ext.kotlin_version = '1.9.20'
+    ext.hilt_version = '2.49'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
-        classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
+        classpath 'com.google.gms:google-services:4.4.0'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         classpath 'com.google.firebase:perf-plugin:1.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+plugins {
+    id 'com.google.devtools.ksp' version '1.9.20-1.0.14' apply false
+}
+
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }