Skip to content

Commit 7d17a5b

Browse files
committed
chore: update dependencies
1 parent 64c8e87 commit 7d17a5b

File tree

7 files changed

+28
-26
lines changed

7 files changed

+28
-26
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
buildscript {
44
ext {
5-
kotlin_version = '1.9.0'
6-
dagger_version = '2.47'
5+
kotlin_version = '1.9.21'
6+
dagger_version = '2.50'
77
multidex_version = "2.0.1"
88
}
99

@@ -13,7 +13,7 @@ buildscript {
1313
mavenCentral()
1414
}
1515
dependencies {
16-
classpath 'com.android.tools.build:gradle:8.0.2'
16+
classpath 'com.android.tools.build:gradle:8.2.0'
1717
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1818

1919

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ android.enableJetifier=true
1717
# org.gradle.parallel=true
1818
kotlin.code.style=official
1919
kotlin.caching.enabled=true
20-
android.defaults.buildfeatures.buildconfig=true
2120
android.nonTransitiveRClass=false
2221
android.nonFinalResIds=false
2322
org.gradle.configuration-cache=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
7-
distributionSha256Sum=f30b29580fe11719087d698da23f3b0f0d04031d8995f7dd8275a31f7674dc01
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
7+
distributionSha256Sum=5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640

tordnscrypt/build.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
android {
8-
compileSdk 33
8+
compileSdk 34
99

1010
namespace 'pan.alexander.tordnscrypt'
1111

@@ -77,15 +77,15 @@ android {
7777
release {
7878
minifyEnabled true
7979
shrinkResources true
80-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
80+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
8181
}
8282
}
8383

8484
compileOptions {
8585
sourceCompatibility = 17
8686
targetCompatibility = 17
8787
}
88-
buildToolsVersion = '33.0.1'
88+
buildToolsVersion = '34.0.0'
8989

9090
bundle {
9191
language {
@@ -129,6 +129,7 @@ android {
129129

130130
buildFeatures {
131131
viewBinding true
132+
buildConfig true
132133
}
133134

134135
kotlinOptions {
@@ -146,18 +147,18 @@ dependencies {
146147
implementation 'androidx.appcompat:appcompat:1.6.1'
147148
implementation 'androidx.preference:preference-ktx:1.2.1'
148149
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
149-
implementation 'com.google.android.material:material:1.9.0'
150+
implementation 'com.google.android.material:material:1.11.0'
150151
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
151-
implementation 'androidx.recyclerview:recyclerview:1.3.1'
152-
implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
153-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
154-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
152+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
153+
implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
154+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
155+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
155156
testImplementation 'junit:junit:4.13.2'
156157
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
157158
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
158159
implementation 'eu.chainfire:libsuperuser:1.1.1'
159160
implementation 'com.jrummyapps:android-shell:1.0.1'
160-
implementation 'androidx.core:core-ktx:1.10.1'
161+
implementation 'androidx.core:core-ktx:1.12.0'
161162
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
162163
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
163164
implementation project(':filepicker')

tordnscrypt/owner.gradle

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def keystoreProperties = new Properties()
99
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
1010

1111
android {
12-
compileSdk 33
12+
compileSdk 34
1313

1414
namespace 'pan.alexander.tordnscrypt'
1515

@@ -120,14 +120,14 @@ android {
120120
release {
121121
minifyEnabled true
122122
shrinkResources true
123-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
123+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
124124
}
125125
}
126126
compileOptions {
127127
sourceCompatibility = 17
128128
targetCompatibility = 17
129129
}
130-
buildToolsVersion = '33.0.1'
130+
buildToolsVersion = '34.0.0'
131131

132132
bundle {
133133
language {
@@ -171,6 +171,7 @@ android {
171171

172172
buildFeatures {
173173
viewBinding true
174+
buildConfig true
174175
}
175176

176177
kotlinOptions {
@@ -190,19 +191,19 @@ dependencies {
190191
implementation 'androidx.appcompat:appcompat:1.6.1'
191192
implementation 'androidx.preference:preference-ktx:1.2.1'
192193
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
193-
implementation 'com.google.android.material:material:1.9.0'
194+
implementation 'com.google.android.material:material:1.11.0'
194195
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
195-
implementation 'androidx.recyclerview:recyclerview:1.3.1'
196-
implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
197-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
198-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
196+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
197+
implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
198+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
199+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
199200
google_playImplementation 'com.android.billingclient:billing:6.0.1'
200201
testImplementation 'junit:junit:4.13.2'
201202
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
202203
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
203204
implementation 'eu.chainfire:libsuperuser:1.1.1'
204205
implementation 'com.jrummyapps:android-shell:1.0.1'
205-
implementation 'androidx.core:core-ktx:1.10.1'
206+
implementation 'androidx.core:core-ktx:1.12.0'
206207
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
207208
implementation project(':filepicker')
208209

tordnscrypt/proguard-rules.pro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@
2828
#fix android.view.InflateException: Error inflating class com.google.android.material.chip.Chip for Android 4.4.2
2929
-keepclassmembers,allowoptimization,allowobfuscation public class com.google.android.material.chip.** {*;}
3030

31-
-keepattributes *Annotation*,SourceFile,LineNumberTable
31+
-keepattributes *Annotation*,SourceFile,LineNumberTable,Signature
32+
-keep class kotlin.coroutines.Continuation

0 commit comments

Comments
 (0)