Skip to content

Commit 47d8213

Browse files
committed
AGP 8.5.2
1 parent 16cfaf0 commit 47d8213

File tree

6 files changed

+29
-18
lines changed

6 files changed

+29
-18
lines changed

.idea/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ org.gradle.workers.max=6
77
org.gradle.parallel=true
88
org.gradle.welcome=never
99

10-
android.enableJetifier=false
1110
android.useAndroidX=true
11+
android.enableJetifier=false
12+
android.suppressUnsupportedCompileSdk=35

gradle/libs.versions.toml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
android_gradle_plugin = '8.3.2'
2+
android_gradle_plugin = '8.5.2'
33
kotlin = '2.0.0'
44
material_design = '1.12.0'
55
retrofit = '2.11.0'
@@ -10,7 +10,7 @@ flexbox = '3.0.0'
1010
jgit = '6.2.0.202206071550-r'
1111
slf4j = '2.0.13'
1212
androidx_appcompat = '1.7.0'
13-
androidx_annotation = '1.8.1'
13+
androidx_annotation = '1.8.2'
1414
androidx_navigation = '2.7.7'
1515
androidx_fragment = '1.8.2'
1616
androidx_recyclerview = '1.3.2'
@@ -41,6 +41,7 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", ver
4141
retrofit_gson_converter = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
4242
jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }
4343
slf4j = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
44+
4445
androidx_databinding = { module = "androidx.databinding:databinding-runtime", version.ref = "android_gradle_plugin" }
4546
androidx_appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx_appcompat" }
4647
androidx_annotation = { module = "androidx.annotation:annotation", version.ref = "androidx_annotation" }
@@ -55,11 +56,14 @@ androidx_room_testing = { module = "androidx.room:room-testing", version.
5556
androidx_room_compiler = { module = "androidx.room:room-compiler", version.ref = "androidx_room" }
5657
androidx_room_runtime = { module = "androidx.room:room-runtime", version.ref = "androidx_room" }
5758
androidx_splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "androidx_splashscreen" }
59+
5860
androidx_test_monitor = { module = "androidx.test:monitor", version.ref = "androidx_test_monitor" }
5961
androidx_test_junit = { module = "androidx.test.ext:junit", version.ref = "androidx_test_junit" }
6062
androidx_test_core = { module = "androidx.test:core", version.ref = "androidx_test_core" }
6163
androidx_test_rules = { module = "androidx.test:rules", version.ref = "androidx_test_rules" }
6264
androidx_test_runner = { module = "androidx.test:runner", version.ref = "androidx_test_runner" }
6365
androidx_test_uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androidx_test_uiautomator" }
64-
androidx_espresso_core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
65-
androidx_espresso_web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }
66+
androidx_test_espresso_core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx_test_espresso" }
67+
androidx_test_espresso_web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx_test_espresso" }
68+
69+
[bundles]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Mon May 15 03:22:49 CEST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

library/build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@ base {
1010

1111
android {
1212
namespace 'io.syslogic.github.api'
13-
buildToolsVersion = '34.0.0'
14-
compileSdk 34
13+
buildToolsVersion = '35.0.0'
14+
compileSdk 35
1515
defaultConfig {
1616
minSdk 22
17-
targetSdk 34
17+
targetSdk 35
1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919
consumerProguardFile "${project.rootDir}/proguard/consumer.pro"
2020
}
2121

22+
sourceSets.main.java.srcDirs = [ "src/main/java" ]
23+
24+
// Room Plugin
2225
room {
2326
schemaDirectory("${rootDir}/schema")
2427
}
@@ -28,8 +31,6 @@ android {
2831
targetCompatibility JavaVersion.VERSION_17
2932
}
3033

31-
sourceSets.main.java.srcDirs = [ "src/main/java" ]
32-
3334
buildFeatures {
3435
buildConfig true
3536
dataBinding true
@@ -137,6 +138,10 @@ tasks.register('javadoc', Javadoc) {
137138
}
138139
}
139140
}
141+
doLast {
142+
// delete temporary directory.
143+
delete project.fileTree('build/tmp7aarsToJars')
144+
}
140145
}
141146

142147
javadoc.onlyIf {

mobile/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ base {
2222

2323
android {
2424
namespace 'io.syslogic.github'
25-
buildToolsVersion = '34.0.0'
26-
compileSdk 34
25+
buildToolsVersion = '35.0.0'
26+
compileSdk 35
2727
defaultConfig {
2828
minSdk 22
29-
targetSdk 34
29+
targetSdk 35
3030
applicationId 'io.syslogic.github'
3131
//noinspection GroovyConstructorNamedArguments
3232
manifestPlaceholders = [ accessToken: "" ]
@@ -166,7 +166,7 @@ dependencies {
166166
// api "org.slf4j:slf4j-nop:$slf4j_version"
167167
api libs.slf4j
168168

169-
// jUnit
169+
// jUnit4
170170
testImplementation libs.junit
171171

172172
// Required for connected tests.
@@ -186,8 +186,8 @@ dependencies {
186186
androidTestImplementation libs.androidx.test.uiautomator
187187

188188
// Espresso
189-
androidTestImplementation libs.androidx.espresso.core
190-
androidTestImplementation libs.androidx.espresso.web
189+
androidTestImplementation libs.androidx.test.espresso.core
190+
androidTestImplementation libs.androidx.test.espresso.web
191191
// androidTestImplementation "androidx.test.espresso:espresso-contrib:$androidx_test_espresso_version"
192192
// androidTestImplementation "androidx.test.espresso:espresso-intents:$androidx_test_espresso_version"
193193
// androidTestImplementation "androidx.test.espresso:espresso-accessibility:$androidx_test_espresso_version"
@@ -196,5 +196,4 @@ dependencies {
196196
// The following dependency can be either "implementation" or "androidTestImplementation",
197197
// depending on whether you want it to appear on your APK's compile classpath or the test APK classpath.
198198
// androidTestImplementation "androidx.test.espresso:espresso-idling-resource:$androidx_test_espresso_version"
199-
200199
}

0 commit comments

Comments
 (0)