Skip to content

Commit 590dfb9

Browse files
committed
Bump deps
1 parent a5e3bf3 commit 590dfb9

6 files changed

+53
-41
lines changed

app/build.gradle.kts

+20-17
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@ plugins {
77
id("kotlin-parcelize")
88
id("androidx.navigation.safeargs.kotlin")
99
id("com.squareup.sqldelight")
10-
id("com.google.devtools.ksp") version "1.8.20-1.0.11"
10+
// https://github.com/google/ksp/releases
11+
id("com.google.devtools.ksp") version "1.9.23-1.0.20"
1112
}
1213

1314
val signingPropertiesFile = rootProject.file("signing.properties")
1415

1516
android {
1617
namespace = "co.appreactor.news"
17-
compileSdk = 33
18+
compileSdk = 34
1819

1920
defaultConfig {
2021
applicationId = "co.appreactor.news"
2122
minSdk = 29
22-
targetSdk = 33
23+
targetSdk = 34
2324
versionCode = 24
2425
versionName = "0.4.3"
2526
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -98,40 +99,41 @@ kotlin {
9899
dependencies {
99100
// Simplifies non-blocking programming
100101
// https://github.com/Kotlin/kotlinx.coroutines/releases
101-
val coroutinesVer = "1.7.0"
102+
val coroutinesVer = "1.8.0"
102103
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVer")
103104
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVer")
104105

105106
// KTX extensions provide concise, idiomatic Kotlin to Jetpack, Android platform, and other APIs
106107
// https://developer.android.com/kotlin/ktx/extensions-list#dependency_6
107-
implementation("androidx.core:core-ktx:1.10.0")
108+
implementation("androidx.core:core-ktx:1.12.0")
108109

109110
// Helps to segment the app into multiple, independent screens that are hosted within an Activity
110111
// https://developer.android.com/jetpack/androidx/releases/fragment
111-
val fragmentVer = "1.5.7"
112+
val fragmentVer = "1.6.2"
112113
implementation("androidx.fragment:fragment-ktx:$fragmentVer")
113114
debugImplementation("androidx.fragment:fragment-testing:$fragmentVer")
114115

115116
// Simplifies in-app navigation, assumes single activity pattern
116117
// https://developer.android.com/jetpack/androidx/releases/navigation
118+
// TODO fix upgrade to 2.7.7, it breaks the bookmarks tab
117119
val navVer = "2.5.3"
118120
implementation("androidx.navigation:navigation-fragment-ktx:$navVer")
119121
implementation("androidx.navigation:navigation-ui-ktx:$navVer")
120122

121123
// Background job scheduler
122124
// Used to fetch new data in background
123125
// https://developer.android.com/jetpack/androidx/releases/work
124-
val workVer = "2.8.1"
126+
val workVer = "2.9.0"
125127
implementation("androidx.work:work-runtime-ktx:$workVer")
126128
androidTestImplementation("androidx.work:work-testing:$workVer")
127129

128130
// In-app browser, it's about 2x faster than calling an external browser
129131
// https://developer.android.com/jetpack/androidx/releases/browser
130-
implementation("androidx.browser:browser:1.5.0")
132+
implementation("androidx.browser:browser:1.8.0")
131133

132134
// Provides lifecycle-aware coroutine scopes
133135
// https://developer.android.com/jetpack/androidx/releases/lifecycle
134-
val lifecycleVer = "2.6.1"
136+
val lifecycleVer = "2.7.0"
135137
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVer")
136138
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVer")
137139

@@ -141,7 +143,7 @@ dependencies {
141143

142144
// List widget
143145
// https://developer.android.com/jetpack/androidx/releases/recyclerview
144-
implementation("androidx.recyclerview:recyclerview:1.3.0")
146+
implementation("androidx.recyclerview:recyclerview:1.3.2")
145147

146148
// Enables swipe to refresh pattern
147149
// https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout
@@ -150,19 +152,19 @@ dependencies {
150152
// Retrofit turns HTTP APIs into Java interfaces
151153
// Used to communicate with remote backends
152154
// https://github.com/square/retrofit/blob/master/CHANGELOG.md
153-
val retrofitVer = "2.9.0"
155+
val retrofitVer = "2.11.0"
154156
implementation("com.squareup.retrofit2:retrofit:$retrofitVer")
155157
implementation("com.squareup.retrofit2:converter-gson:$retrofitVer")
156158

157159
// Modern HTTP client
158160
// https://github.com/square/okhttp/blob/master/CHANGELOG.md
159-
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
161+
implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
160162
implementation("com.squareup.okhttp3:okhttp")
161163
testImplementation("com.squareup.okhttp3:mockwebserver")
162164

163165
// Bundle SQLite binaries
164166
// https://github.com/requery/sqlite-android/releases
165-
implementation("com.github.requery:sqlite-android:3.41.1")
167+
implementation("com.github.requery:sqlite-android:3.45.0")
166168

167169
// SQLDelight generates typesafe kotlin APIs from SQL statements
168170
// https://github.com/cashapp/sqldelight/releases
@@ -174,12 +176,13 @@ dependencies {
174176
// Dependency injection framework
175177
// https://github.com/InsertKoinIO/koin/tags
176178
val koinAnnotationsVer = "1.0.0"
177-
implementation("io.insert-koin:koin-android:3.4.0")
179+
implementation("io.insert-koin:koin-android:3.5.0")
178180
implementation("io.insert-koin:koin-annotations:$koinAnnotationsVer")
179181
ksp("io.insert-koin:koin-ksp-compiler:$koinAnnotationsVer")
180182

181183
// Material design components
182184
// https://github.com/material-components/material-components-android/releases
185+
// TODO fix upgrade to 1.11.0, it makes the bottom navigation panel ugly
183186
implementation("com.google.android.material:material:1.9.0")
184187

185188
// Used to download, cache and display images
@@ -189,7 +192,7 @@ dependencies {
189192
// Java HTML parser
190193
// Used to auto-discover feed links
191194
// https://github.com/jhy/jsoup/releases
192-
implementation("org.jsoup:jsoup:1.16.1")
195+
implementation("org.jsoup:jsoup:1.17.2")
193196

194197
// Feed parser
195198
// Used in standalone mode
@@ -198,7 +201,7 @@ dependencies {
198201

199202
// Custom global exception handler
200203
// https://github.com/ACRA/acra/releases
201-
val acraVer = "5.10.0-beta03"
204+
val acraVer = "5.11.3"
202205
implementation("ch.acra:acra-mail:$acraVer")
203206
implementation("ch.acra:acra-dialog:$acraVer")
204207

@@ -208,7 +211,7 @@ dependencies {
208211

209212
// Mocking library, better to go easy on that
210213
// https://github.com/mockk/mockk/releases
211-
testImplementation("io.mockk:mockk:1.13.5")
214+
testImplementation("io.mockk:mockk:1.13.10")
212215

213216
// Core test infrastructure
214217
// https://junit.org/junit4/

build.gradle.kts

+8-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath("com.android.tools.build:gradle:8.1.2")
9-
classpath(kotlin("gradle-plugin", version = "1.8.20"))
10-
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
11-
classpath("com.squareup.sqldelight:gradle-plugin:1.5.4")
8+
// https://developer.android.com/build/releases/gradle-plugin
9+
classpath("com.android.tools.build:gradle:8.3.2")
10+
// https://github.com/JetBrains/kotlin/releases
11+
classpath(kotlin("gradle-plugin", version = "1.9.23"))
12+
// https://developer.android.com/jetpack/androidx/releases/navigation
13+
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7")
14+
// https://github.com/cashapp/sqldelight/releases
15+
classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
1216
}
1317
}
1418

gradle/wrapper/gradle-wrapper.jar

-18.2 KB
Binary file not shown.
+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

+13-9
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum
@@ -130,26 +131,29 @@ location of your Java installation."
130131
fi
131132
else
132133
JAVACMD=java
133-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134137
135138
Please set the JAVA_HOME variable in your environment to match the
136139
location of your Java installation."
140+
fi
137141
fi
138142

139143
# Increase the maximum file descriptors if we can.
140144
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
141145
case $MAX_FD in #(
142146
max*)
143147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
144-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
145149
MAX_FD=$( ulimit -H -n ) ||
146150
warn "Could not query maximum file descriptor limit"
147151
esac
148152
case $MAX_FD in #(
149153
'' | soft) :;; #(
150154
*)
151155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
152-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
153157
ulimit -n "$MAX_FD" ||
154158
warn "Could not set maximum file descriptor limit to $MAX_FD"
155159
esac
@@ -198,11 +202,11 @@ fi
198202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
199203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
200204

201-
# Collect all arguments for the java command;
202-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
203-
# shell script including quotes and variable substitutions, so put them in
204-
# double quotes to make sure that they get re-expanded; and
205-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
206210

207211
set -- \
208212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

+10-10
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

0 commit comments

Comments
 (0)