Skip to content

Commit 3954348

Browse files
committedNov 13, 2023
Update compileSdk and library versions
To solve compiling errors it was necessary to update all library versions and the compileSdk to the latest version. Also removed: - butterknife rules from proguard-rules - nonFinalResIds directive as non final R resources were fixed in #838
1 parent 69ff300 commit 3954348

File tree

3 files changed

+23
-28
lines changed

3 files changed

+23
-28
lines changed
 

‎app/build.gradle

+23-22
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def getVersionName = { ->
1010
}
1111

1212
android {
13-
compileSdkVersion 32
13+
compileSdk 34
1414

1515
defaultConfig {
1616
applicationId "org.xbmc.kore"
@@ -99,27 +99,27 @@ ext {
9999
}
100100

101101
dependencies {
102-
implementation 'com.google.android.material:material:1.6.1'
103-
implementation 'androidx.preference:preference:1.2.0'
104-
implementation 'androidx.appcompat:appcompat:1.5.1'
105-
implementation 'androidx.recyclerview:recyclerview:1.2.1'
102+
implementation 'com.google.android.material:material:1.10.0'
103+
implementation 'androidx.preference:preference:1.2.1'
104+
implementation 'androidx.appcompat:appcompat:1.6.1'
105+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
106106
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
107-
implementation('androidx.core:core-google-shortcuts:1.0.1') {
107+
implementation('androidx.core:core-google-shortcuts:1.1.0') {
108108
exclude group:'com.google.android.gms'
109109
}
110110
implementation 'androidx.media:media:1.6.0'
111-
implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
111+
implementation "androidx.viewpager2:viewpager2:1.1.0-beta02"
112112
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
113113

114-
implementation "androidx.fragment:fragment:1.5.2"
115-
implementation "androidx.fragment:fragment-ktx:1.5.2"
114+
implementation "androidx.fragment:fragment:1.6.2"
115+
implementation "androidx.fragment:fragment-ktx:1.6.2"
116116

117117
// Dependency resolution
118-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
119-
implementation "androidx.lifecycle:lifecycle-viewmodel:2.5.1"
118+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
119+
implementation "androidx.lifecycle:lifecycle-viewmodel:2.6.2"
120120

121121
implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
122-
implementation 'com.squareup.okhttp3:okhttp:4.10.0'
122+
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
123123
implementation 'com.squareup.picasso:picasso:2.71828'
124124
implementation 'org.greenrobot:eventbus:3.3.1'
125125
implementation 'org.jmdns:jmdns:3.5.7'
@@ -129,24 +129,25 @@ dependencies {
129129

130130
implementation fileTree(dir: 'libs', include: ['*.jar'])
131131

132-
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
133-
androidTestImplementation 'androidx.test:rules:1.4.0'
134-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
135-
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
132+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
133+
androidTestImplementation 'androidx.test:rules:1.5.0'
134+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
135+
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
136136
androidTestImplementation 'androidx.legacy:legacy-support-v13:1.0.0'
137137
androidTestImplementation 'org.hamcrest:hamcrest-library:2.2'
138138
androidTestImplementation 'junit:junit:4.13.2'
139-
androidTestUtil 'androidx.test:orchestrator:1.4.1'
139+
androidTestUtil 'androidx.test:orchestrator:1.4.2'
140140

141141
testImplementation 'org.robolectric:robolectric:4.8.1'
142-
testImplementation 'androidx.test:core:1.4.0'
143-
testImplementation 'androidx.test.ext:junit:1.1.3'
142+
testImplementation 'androidx.test:core:1.5.0'
143+
testImplementation 'androidx.test.ext:junit:1.1.5'
144144
debugImplementation 'junit:junit:4.13.2'
145145
}
146146

147147
def adb = android.getAdbExecutable().toString()
148148
afterEvaluate {
149-
task grantAnimationPermissionDev(type: Exec, dependsOn: installDebug) {
149+
tasks.register('grantAnimationPermissionDev', Exec) {
150+
dependsOn installDebug
150151
doFirst {
151152
println("Executing: $adb shell pm grant $android.defaultConfig.applicationId android.permission.SET_ANIMATION_SCALE")
152153
commandLine "$adb shell pm grant $android.defaultConfig.applicationId android.permission.SET_ANIMATION_SCALE".split(' ')
@@ -162,12 +163,12 @@ afterEvaluate {
162163
/**
163164
* Makes sure assets are copied before running the unit tests
164165
*/
165-
tasks.whenTaskAdded { task ->
166+
tasks.configureEach { task ->
166167
if (task.name.contains("testDebugUnitTest")) {
167168
task.dependsOn assembleDebug
168169
}
169170
}
170171

171-
tasks.withType(JavaCompile) {
172+
tasks.withType(JavaCompile).configureEach {
172173
options.compilerArgs << '-Xlint:unchecked' // << '-Xlint:deprecation'
173174
}

‎app/proguard-rules.pro

-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
# okio via OkHttp
1919
-dontwarn okio.**
2020

21-
# Butterknife
22-
-dontwarn butterknife.internal.**
23-
-keep class **$$ViewBinder { *; }
24-
-keepnames class * { @butterknife.BindView *;}
25-
2621
# Jackson
2722
-dontskipnonpubliclibraryclassmembers
2823
-keepattributes EnclosingMethod, Signature

‎gradle.properties

-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ android.useAndroidX=true
1616
android.enableJetifier=true
1717
android.defaults.buildfeatures.buildconfig=true
1818
android.nonTransitiveRClass=false
19-
android.nonFinalResIds=false

0 commit comments

Comments
 (0)
Please sign in to comment.