Skip to content

Commit 157d653

Browse files
anthonydmaysanthonydmays
committed
chore: upgrade gson deps and additional gradle wrappers
1 parent 02663d0 commit 157d653

File tree

32 files changed

+196
-141
lines changed

32 files changed

+196
-141
lines changed

‎lesson_09/types/types_app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// This dependency is used by the application.
2626
implementation("com.codedifferently.instructional:instructional-lib")
2727
implementation("com.google.guava:guava:31.1-jre")
28-
implementation("com.google.code.gson:gson:2.10.1")
28+
implementation("com.google.code.gson:gson:2.11.0")
2929
implementation("org.projectlombok:lombok:1.18.30")
3030
implementation("org.springframework.boot:spring-boot-starter")
3131
}

‎lesson_11/arrays_java/arrays_app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// This dependency is used by the application.
2626
implementation("com.codedifferently.instructional:instructional-lib")
2727
implementation("com.google.guava:guava:31.1-jre")
28-
implementation("com.google.code.gson:gson:2.10.1")
28+
implementation("com.google.code.gson:gson:2.11.0")
2929
implementation("org.projectlombok:lombok:1.18.30")
3030
implementation("org.springframework.boot:spring-boot-starter")
3131
}

‎lesson_12/structs_java/structs_app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// This dependency is used by the application.
2626
implementation("com.codedifferently.instructional:instructional-lib")
2727
implementation("com.google.guava:guava:31.1-jre")
28-
implementation("com.google.code.gson:gson:2.10.1")
28+
implementation("com.google.code.gson:gson:2.11.0")
2929
implementation("org.projectlombok:lombok:1.18.30")
3030
implementation("org.springframework.boot:spring-boot-starter")
3131
}

‎lesson_13/maps_java/gradle/wrapper/gradle-wrapper.jar

-17.6 KB
Binary file not shown.

‎lesson_13/maps_java/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
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.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

‎lesson_13/maps_java/gradlew

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
8385
# This is normally unused
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -133,26 +134,29 @@ location of your Java installation."
133134
fi
134135
else
135136
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137140
138141
Please set the JAVA_HOME variable in your environment to match the
139142
location of your Java installation."
143+
fi
140144
fi
141145

142146
# Increase the maximum file descriptors if we can.
143147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
146150
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
151+
# shellcheck disable=SC2039,SC3045
148152
MAX_FD=$( ulimit -H -n ) ||
149153
warn "Could not query maximum file descriptor limit"
150154
esac
151155
case $MAX_FD in #(
152156
'' | soft) :;; #(
153157
*)
154158
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
159+
# shellcheck disable=SC2039,SC3045
156160
ulimit -n "$MAX_FD" ||
157161
warn "Could not set maximum file descriptor limit to $MAX_FD"
158162
esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
197201
done
198202
fi
199203

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

206214
set -- \
207215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

‎lesson_13/maps_java/gradlew.bat

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

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.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

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

5860
if exist "%JAVA_EXE%" goto execute
5961

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.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

‎lesson_13/maps_java/maps_app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// This dependency is used by the application.
2626
implementation("com.codedifferently.instructional:instructional-lib")
2727
implementation("com.google.guava:guava:31.1-jre")
28-
implementation("com.google.code.gson:gson:2.10.1")
28+
implementation("com.google.code.gson:gson:2.11.0")
2929
implementation("org.projectlombok:lombok:1.18.30")
3030
implementation("org.springframework.boot:spring-boot-starter")
3131
}

‎lesson_13/maps_ts/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
"license": "ISC",
1919
"devDependencies": {
2020
"@alfonso-presa/soft-assert": "^0.6.0",
21-
"@eslint/js": "^9.11.1",
22-
"@nestjs/testing": "^10.4.4",
23-
"@stylistic/eslint-plugin": "^2.8.0",
21+
"@eslint/js": "^9.17.0",
22+
"@nestjs/testing": "^10.4.15",
23+
"@stylistic/eslint-plugin": "^2.12.1",
2424
"@types/eslint__js": "^8.42.3",
25-
"@types/jest": "^29.5.13",
26-
"@types/node": "20.12.7",
25+
"@types/jest": "^29.5.14",
26+
"@types/node": "22.10.2",
2727
"copyfiles": "^2.4.1",
28-
"eslint": "^9.11.1",
28+
"eslint": "^9.17.0",
2929
"eslint-config-prettier": "^9.1.0",
3030
"jest": "^29.7.0",
31-
"prettier": "3.3.3",
31+
"prettier": "3.4.2",
3232
"ts-jest": "^29.2.5",
3333
"ts-node": "^10.9.2",
34-
"tsc-watch": "^6.2.0",
35-
"typescript": "^5.6.2",
36-
"typescript-eslint": "^8.7.0"
34+
"tsc-watch": "^6.2.1",
35+
"typescript": "^5.7.2",
36+
"typescript-eslint": "^8.18.0"
3737
},
3838
"dependencies": {}
3939
}

‎lesson_14/exceptions/exceptions_app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
// This dependency is used by the application.
2626
implementation("com.codedifferently.instructional:instructional-lib")
2727
implementation("com.google.guava:guava:31.1-jre")
28-
implementation("com.google.code.gson:gson:2.10.1")
28+
implementation("com.google.code.gson:gson:2.11.0")
2929
implementation("org.projectlombok:lombok:1.18.30")
3030
implementation("org.springframework.boot:spring-boot-starter")
3131
}

0 commit comments

Comments
 (0)