Merge pull request #124 from steamclock/jl/updating-dependencies-and-gradle

update gradle to 8.0 and dependencies

Author: munl

app/build.gradle

@@ -8,7 +8,7 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     // Provides auto-uploading of proguard mappings to Sentry
-    id 'io.sentry.android.gradle' version '3.11.0'
+    id 'io.sentry.android.gradle' version '4.5.1'
 }
 
 /**
@@ -24,8 +24,8 @@ configurations.configureEach {
 android {
     compileSdkVersion versions.compileSdk
 
-    kotlinOptions {
-        jvmTarget = "1.8"
+    kotlin {
+        jvmToolchain(17)
     }
 
     buildFeatures {
@@ -58,8 +58,8 @@ android {
 dependencies {
     implementation project(':steamclog')
     // Since Sentry is a dependency of steamclog, we do not have to import it again
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'com.google.android.material:material:1.12.0'
 }

app/proguard-rules.pro

@@ -18,4 +18,5 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn javax.lang.model.element.Modifier

app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".App"
@@ -22,6 +23,10 @@
 
         <meta-data android:name="io.sentry.dsn" android:value="https://59bb07e12aa7421b8f5fd9ae3420c21c@o386150.ingest.sentry.io/5399932" />
 
+        <!-- For some reason io.sentry.auto-init is set to false; this means that Sentry will not capture logs unless we manually init -->
+        <meta-data android:name="io.sentry.auto-init" android:value="true" tools:replace="android:value" />
+
+
     </application>
 
 </manifest>

build.gradle

@@ -2,8 +2,8 @@
 buildscript {
 
     ext.versions = [
-        "compileSdk": 33,
-        "kotlin": "1.8.10",
+        "compileSdk": 34,
+        "kotlin": "2.0.0",
         "timber": "5.0.1",
         "sentry": "6.23.0"
     ]
@@ -14,7 +14,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -18,4 +18,8 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.enableR8.fullMode=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Aug 01 09:31:10 PDT 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

steamclog/build.gradle

@@ -18,7 +18,7 @@ afterEvaluate {
                 // You can then customize attributes of the publication as shown below.
                 groupId = 'com.steamclock.steamclog'
                 artifactId = 'release'
-                version = 'v2.4'
+                version = 'v2.5'
             }
         }
     }
@@ -27,18 +27,21 @@ afterEvaluate {
 android {
     compileSdkVersion versions.compileSdk
 
+    publishing {
+        //Publish your app as an AAB
+        singleVariant("release")
+    }
+
     // ADD COMPATIBILITY OPTIONS TO BE COMPATIBLE WITH JAVA 1.8
     // Added for Sentry support
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion versions.compileSdk
-        versionCode 4
-        versionName "2.4"
         consumerProguardFiles "consumer-rules.pro"
     }