aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreuxane2024-09-18 23:41:13 +0200
committereuxane2024-09-18 23:41:13 +0200
commit8ebbb2a54d31e5a88e4e89662bb4aec8d02c2d32 (patch)
tree4a56607546c9abf2de56018f69722e0516dc7044
parent6b0397c56891a9ff3f4da3adafb4cea1520515eb (diff)
downloadtincapp-8ebbb2a54d31e5a88e4e89662bb4aec8d02c2d32.tar.gz
project: gradle 8.0.2 -> 8.4.2
Together with necessary adjustments for Kotlin and build options.
-rw-r--r--app/build.gradle10
-rw-r--r--build.gradle4
-rw-r--r--gradle.properties1
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
4 files changed, 13 insertions, 4 deletions
diff --git a/app/build.gradle b/app/build.gradle
index f7aaa6a..da1ef2b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,10 +67,20 @@ android {
67 } 67 }
68 68
69 buildFeatures { 69 buildFeatures {
70 buildConfig = true
70 dataBinding = true 71 dataBinding = true
71 viewBinding = true 72 viewBinding = true
72 } 73 }
73 74
75 compileOptions {
76 sourceCompatibility JavaVersion.VERSION_17
77 targetCompatibility JavaVersion.VERSION_17
78 }
79
80 kotlinOptions {
81 jvmTarget = '17'
82 }
83
74 namespace 'org.pacien.tincapp' 84 namespace 'org.pacien.tincapp'
75} 85}
76 86
diff --git a/build.gradle b/build.gradle
index 3b98745..2b3c217 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@
19// Top-level build file where you can add configuration options common to all sub-projects/modules. 19// Top-level build file where you can add configuration options common to all sub-projects/modules.
20 20
21buildscript { 21buildscript {
22 ext.kotlin_version = '1.7.20' 22 ext.kotlin_version = '1.9.20'
23 23
24 repositories { 24 repositories {
25 mavenCentral() 25 mavenCentral()
@@ -27,7 +27,7 @@ buildscript {
27 } 27 }
28 28
29 dependencies { 29 dependencies {
30 classpath 'com.android.tools.build:gradle:8.0.2' 30 classpath 'com.android.tools.build:gradle:8.4.2'
31 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 31 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
32 32
33 // NOTE: Do not place your application dependencies here; they belong 33 // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 8a00bc8..d053c8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,6 @@
22# http://www.gradle.org/docs/current/userguide/build_environment.html 22# http://www.gradle.org/docs/current/userguide/build_environment.html
23# Specifies the JVM arguments used for the daemon process. 23# Specifies the JVM arguments used for the daemon process.
24# The setting is particularly useful for tweaking memory settings. 24# The setting is particularly useful for tweaking memory settings.
25android.defaults.buildfeatures.buildconfig=true
26android.enableJetifier=true 25android.enableJetifier=true
27android.nonFinalResIds=false 26android.nonFinalResIds=false
28android.nonTransitiveRClass=false 27android.nonTransitiveRClass=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0b36af7..4e06f3d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
3distributionPath=wrapper/dists 3distributionPath=wrapper/dists
4zipStoreBase=GRADLE_USER_HOME 4zipStoreBase=GRADLE_USER_HOME
5zipStorePath=wrapper/dists 5zipStorePath=wrapper/dists
6distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip 6distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip