Skip to content

Commit 866fedd

Browse files
committed
AGP 8.11.0
1 parent 2cb9afe commit 866fedd

File tree

6 files changed

+73
-71
lines changed

6 files changed

+73
-71
lines changed

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ if (System.env.JITPACK) {
1414
project.ext.set('archiveBuildTypes', ['debug', 'release'])
1515

1616
/** Keystore Settings, loaded from keystore.properties */
17-
if (rootProject.file('keystore.properties').exists()) {
17+
def keystoreConfig = rootProject.file('keystore.properties')
18+
if (keystoreConfig.exists()) {
1819
def keystore = new Properties()
19-
def ins = new FileInputStream(rootProject.file('keystore.properties'))
20+
def ins = new FileInputStream(keystoreConfig)
2021
keystore.load(ins)
2122
project.ext.set('debugKeystorePass', keystore['debugKeystorePass'])
2223
project.ext.set('debugKeyAlias', keystore['debugKeyAlias'])

gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ android_target_sdk = '36'
77
android_min_sdk = '22'
88

99
# Gradle Plugins
10-
android_gradle_plugin = '8.10.0'
11-
kotlin = '2.1.20'
10+
android_gradle_plugin = '8.11.0'
11+
kotlin = '2.2.0'
1212
material_design = '1.12.0'
13-
retrofit = '2.11.0'
14-
gson = '2.12.1'
13+
retrofit = '3.0.0'
14+
gson = '2.13.1'
1515
junit = '4.13.2'
1616
flexbox = '3.0.0'
1717
# Note: DirCacheCheckout.java uses InputStream.transferTo() since jgit 6.3; no such method on Android.
1818
jgit = '6.2.0.202206071550-r'
19-
slf4j = '2.0.16'
20-
androidx_appcompat = '1.7.0'
19+
slf4j = '2.0.17'
20+
androidx_appcompat = '1.7.1'
2121
androidx_annotation = '1.9.1'
2222
androidx_navigation = '2.9.0'
23-
androidx_fragment = '1.8.6'
23+
androidx_fragment = '1.8.8'
2424
androidx_recyclerview = '1.4.0'
2525
androidx_cardview = '1.0.0'
2626
androidx_preference = '1.2.1'
27-
androidx_room = '2.7.1'
27+
androidx_room = '2.7.2'
2828
androidx_splashscreen = '1.0.1'
2929
androidx_test_junit = '1.2.1'
3030
androidx_test_core = '1.6.1'
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.14.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

jitpack.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# https://jitpack.io/docs/BUILDING/#custom-commands
2+
jdk:
3+
- openjdk17
24
before_install:
3-
# - sdk install java 17.0.7-oracle
4-
# - sdk use java 17.0.7-oracle
5-
- sdk update
5+
- sdk install java 17.0.14-amzn
6+
- sdk use java 17.0.14-amzn

library/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.androidx.room)
4-
id 'maven-publish'
4+
id "maven-publish"
55
}
66

7-
group = 'io.syslogic'
7+
group = "io.syslogic"
88
version = libs.versions.app.version.name.get()
99

1010
base {
@@ -20,7 +20,7 @@ android {
2020
minSdk = Integer.parseInt(libs.versions.android.min.sdk.get())
2121
targetSdk = Integer.parseInt(libs.versions.android.target.sdk.get())
2222
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
23-
consumerProguardFile "${project.rootDir}/proguard/consumer.pro"
23+
consumerProguardFile("${project.rootDir}/proguard/consumer.pro")
2424
}
2525

2626
sourceSets.main.java.srcDirs = [ "src/main/java" ]
@@ -52,14 +52,14 @@ android {
5252
}
5353

5454
publishing {
55-
singleVariant('release') {
55+
singleVariant("release") {
5656
withSourcesJar()
5757
withJavadocJar()
5858
}
5959
}
6060

6161
lint {
62-
lintConfig = project.file('lint.xml')
62+
lintConfig = project.file("lint.xml")
6363
checkAllWarnings = true
6464
warningsAsErrors = true
6565
abortOnError = false
@@ -84,7 +84,7 @@ dependencies {
8484
// Room Runtime
8585
annotationProcessor(libs.androidx.room.compiler)
8686
testImplementation(libs.androidx.room.testing)
87-
implementation(libs.androidx.room.runtime)
87+
api(libs.androidx.room.runtime)
8888

8989
// Retrofit2
9090
implementation(libs.gson)

mobile/build.gradle

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ plugins {
66
}
77

88
/** Load API access-token from file `token.properties` */
9-
if (rootProject.file('token.properties').exists()) {
10-
def apikeys = new Properties()
11-
def fis = new FileInputStream(rootProject.file('token.properties'))
12-
apikeys.load(fis)
13-
project.ext.set('accessToken', apikeys['accessToken'])
9+
if (rootProject.file("token.properties").exists()) {
10+
def fis = new FileInputStream(rootProject.file("token.properties"))
11+
def token = new Properties()
12+
token.load(fis)
13+
project.ext.set("accessToken", token['accessToken'])
1414
fis.close()
1515
} else {
1616
println "*** File `token.properties` is missing; the GitHub API may be rate-limited."
@@ -28,11 +28,11 @@ android {
2828
buildToolsVersion = libs.versions.android.build.tools.get()
2929
compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
3030
defaultConfig {
31+
applicationId = "io.syslogic.github"
3132
minSdk = Integer.parseInt(libs.versions.android.min.sdk.get())
3233
targetSdk = Integer.parseInt(libs.versions.android.target.sdk.get())
3334
versionCode = Integer.parseInt(libs.versions.app.version.code.get())
3435
versionName = libs.versions.app.version.name.get()
35-
applicationId = "io.syslogic.github"
3636
//noinspection GroovyConstructorNamedArguments
3737
manifestPlaceholders = [ accessToken: "" ]
3838
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -63,18 +63,18 @@ android {
6363
signingConfigs {
6464
debug {
6565
storeFile new File("${System.properties['user.home']}/.android/debug.keystore")
66-
if (rootProject.file('keystore.properties').exists()) {
67-
storePassword rootProject.ext.get('debugKeystorePass')
68-
keyAlias rootProject.ext.get('debugKeyAlias')
69-
keyPassword rootProject.ext.get('debugKeyPass')
66+
if (rootProject.file("keystore.properties").exists()) {
67+
storePassword rootProject.ext.get("debugKeystorePass")
68+
keyAlias rootProject.ext.get("debugKeyAlias")
69+
keyPassword rootProject.ext.get("debugKeyPass")
7070
}
7171
}
7272
release {
7373
storeFile new File("${System.properties['user.home']}/.android/release.keystore")
74-
if (rootProject.file('keystore.properties').exists()) {
75-
storePassword rootProject.ext.get('releaseKeystorePass')
76-
keyAlias rootProject.ext.get('releaseKeyAlias')
77-
keyPassword rootProject.ext.get('releaseKeyPass')
74+
if (rootProject.file("keystore.properties").exists()) {
75+
storePassword rootProject.ext.get("releaseKeystorePass")
76+
keyAlias rootProject.ext.get("releaseKeyAlias")
77+
keyPassword rootProject.ext.get("releaseKeyPass")
7878
}
7979
}
8080
}
@@ -112,7 +112,7 @@ android {
112112
}
113113

114114
lint {
115-
lintConfig = project.file('lint.xml')
115+
lintConfig = project.file("lint.xml")
116116
checkAllWarnings = true
117117
warningsAsErrors = true
118118
abortOnError = false
@@ -122,79 +122,79 @@ android {
122122

123123
dependencies {
124124

125-
api project(path: ':library')
125+
api(project(path: ":library"))
126126

127127
// Material Design Components
128-
implementation libs.material.design
128+
implementation(libs.material.design)
129129

130130
// Annotations
131-
implementation libs.androidx.annotation
131+
implementation(libs.androidx.annotation)
132132

133133
// Flexbox Layout
134-
implementation libs.flexbox
134+
implementation(libs.flexbox)
135135

136136
// https://developer.android.com/jetpack/androidx/
137-
implementation libs.androidx.appcompat
138-
implementation libs.androidx.splashscreen
139-
implementation libs.androidx.recyclerview
140-
implementation libs.androidx.preference
141-
implementation libs.androidx.cardview
137+
implementation(libs.androidx.appcompat)
138+
implementation(libs.androidx.splashscreen)
139+
implementation(libs.androidx.recyclerview)
140+
implementation(libs.androidx.preference)
141+
implementation(libs.androidx.cardview)
142142

143143
// Navigation
144-
androidTestImplementation libs.androidx.navigation.testing
145-
implementation libs.androidx.navigation.fragment
144+
androidTestImplementation(libs.androidx.navigation.testing)
145+
implementation(libs.androidx.navigation.fragment)
146146

147147
// Fragment
148-
androidTestImplementation libs.androidx.fragment.testing
149-
implementation libs.androidx.fragment
148+
androidTestImplementation(libs.androidx.fragment.testing)
149+
implementation(libs.androidx.fragment)
150150

151151
// Room Runtime
152-
annotationProcessor libs.androidx.room.compiler
153-
testImplementation libs.androidx.room.testing
154-
implementation libs.androidx.room.runtime
152+
annotationProcessor(libs.androidx.room.compiler)
153+
testImplementation(libs.androidx.room.testing)
154+
implementation(libs.androidx.room.runtime)
155155

156156
// Retrofit2
157-
implementation libs.gson
158-
implementation libs.retrofit
159-
implementation (libs.retrofit.gson.converter) {
157+
implementation(libs.gson)
158+
implementation(libs.retrofit)
159+
implementation(libs.retrofit.gson.converter) {
160160
exclude group: "com.google.code.gson", module: "gson"
161161
}
162162

163163
// https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit
164-
implementation libs.jgit
164+
implementation(libs.jgit)
165165

166166
// https://mvnrepository.com/artifact/org.slf4j/slf4j-simple
167-
// api "org.slf4j:slf4j-nop:$slf4j_version"
168-
api libs.slf4j
167+
// api("org.slf4j:slf4j-nop:$slf4j_version")
168+
api(libs.slf4j)
169169

170170
// jUnit4
171-
testImplementation libs.junit
171+
testImplementation(libs.junit)
172172

173173
// Required for connected tests.
174174
// https://mvnrepository.com/artifact/androidx.test/monitor
175-
debugImplementation libs.androidx.test.monitor
175+
debugImplementation(libs.androidx.test.monitor)
176176

177177
// https://mvnrepository.com/artifact/androidx.test.ext
178-
androidTestImplementation libs.androidx.test.junit
178+
androidTestImplementation(libs.androidx.test.junit)
179179

180180
// https://mvnrepository.com/artifact/androidx.test
181181
// https://developer.android.com/jetpack/androidx/releases/test
182-
androidTestImplementation libs.androidx.test.core
183-
androidTestImplementation libs.androidx.test.runner
184-
androidTestImplementation libs.androidx.test.rules
182+
androidTestImplementation(libs.androidx.test.core)
183+
androidTestImplementation(libs.androidx.test.runner)
184+
androidTestImplementation(libs.androidx.test.rules)
185185

186186
// https://mvnrepository.com/artifact/androidx.test.uiautomator/uiautomator
187-
androidTestImplementation libs.androidx.test.uiautomator
187+
androidTestImplementation(libs.androidx.test.uiautomator)
188188

189189
// Espresso
190-
androidTestImplementation libs.androidx.test.espresso.core
191-
androidTestImplementation libs.androidx.test.espresso.web
192-
// androidTestImplementation "androidx.test.espresso:espresso-contrib:$androidx_test_espresso_version"
193-
// androidTestImplementation "androidx.test.espresso:espresso-intents:$androidx_test_espresso_version"
194-
// androidTestImplementation "androidx.test.espresso:espresso-accessibility:$androidx_test_espresso_version"
195-
// androidTestImplementation "androidx.test.espresso.idling:idling-concurrent:$espresso_version"
190+
androidTestImplementation(libs.androidx.test.espresso.core)
191+
androidTestImplementation(libs.androidx.test.espresso.web)
192+
// androidTestImplementation("androidx.test.espresso:espresso-contrib:$androidx_test_espresso_version")
193+
// androidTestImplementation("androidx.test.espresso:espresso-intents:$androidx_test_espresso_version")
194+
// androidTestImplementation("androidx.test.espresso:espresso-accessibility:$androidx_test_espresso_version")
195+
// androidTestImplementation("androidx.test.espresso.idling:idling-concurrent:$espresso_version")
196196

197197
// The following dependency can be either "implementation" or "androidTestImplementation",
198198
// depending on whether you want it to appear on your APK's compile classpath or the test APK classpath.
199-
// androidTestImplementation "androidx.test.espresso:espresso-idling-resource:$androidx_test_espresso_version"
199+
// androidTestImplementation("androidx.test.espresso:espresso-idling-resource:$androidx_test_espresso_version")
200200
}

0 commit comments

Comments
 (0)