Skip to content

Commit bded0b4

Browse files
committed
ADB upgrade
1 parent c41a799 commit bded0b4

4 files changed

Lines changed: 21 additions & 16 deletions

File tree

android/app/build.gradle

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,22 @@ plugins {
22
id 'com.android.application'
33
id 'org.jetbrains.kotlin.android'
44
id 'com.google.gms.google-services'
5-
id "io.sentry.android.gradle" version "4.3.1"
5+
id "io.sentry.android.gradle" version "6.2.0"
66
}
77

8-
def getGitHash = { ->
9-
def stdout = new ByteArrayOutputStream()
10-
exec {
11-
commandLine 'git', 'rev-parse', '--short', 'HEAD'
12-
standardOutput = stdout
13-
}
14-
return stdout.toString().trim()
15-
}
8+
def gitHash = providers.exec {
9+
commandLine 'git', 'rev-parse', '--short', 'HEAD'
10+
}.standardOutput.asText.map { it.trim() }.getOrElse("unknown")
1611

1712
android {
18-
compileSdk 35
13+
compileSdk 36
1914

2015
defaultConfig {
2116
applicationId "com.httpsms"
2217
minSdk 28
2318
targetSdk 35
2419
versionCode 1
25-
versionName "${getGitHash()}"
20+
versionName gitHash
2621
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2722
}
2823

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
ext {
4-
kotlin_version = '2.1.0'
4+
kotlin_version = '2.2.10'
55
}
66
repositories {
77
// Check that you have the following line (if not, add it):
@@ -17,9 +17,9 @@ buildscript {
1717
}
1818

1919
plugins {
20-
id 'com.android.application' version '8.13.2' apply false
21-
id 'com.android.library' version '8.13.2' apply false
22-
id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
20+
id 'com.android.application' version '9.1.0' apply false
21+
id 'com.android.library' version '9.1.0' apply false
22+
id 'org.jetbrains.kotlin.android' version '2.3.20' apply false
2323
}
2424

2525
tasks.register('clean', Delete) {

android/gradle.properties

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,13 @@ kotlin.code.style=official
2222
# thereby reducing the size of the R class for that library
2323
android.nonTransitiveRClass=true
2424
android.nonFinalResIds=false
25+
android.defaults.buildfeatures.resvalues=true
26+
android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
27+
android.enableAppCompileTimeRClass=false
28+
android.usesSdkInManifest.disallowed=false
29+
android.uniquePackageNames=false
30+
android.dependency.useConstraints=true
31+
android.r8.strictFullModeForKeepRules=false
32+
android.r8.optimizedResourceShrinking=false
33+
android.builtInKotlin=false
34+
android.newDsl=false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Jun 23 15:32:32 EEST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)