Skip to content

Commit

Permalink
Update to Kotlin 2.1.0 and Ktor 3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
pambrose committed Dec 3, 2024
1 parent 335ab0c commit a450a35
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ versioncheck:
./gradlew dependencyUpdates

upgrade-wrapper:
./gradlew wrapper --gradle-version=8.10.2 --distribution-type=bin
./gradlew wrapper --gradle-version=8.11.1 --distribution-type=bin
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'application'
id 'org.jetbrains.kotlin.jvm' version '2.0.21'
id 'org.jetbrains.kotlin.jvm' version '2.1.0'
id "com.github.ben-manes.versions" version "0.51.0"
}

Expand All @@ -20,7 +20,7 @@ repositories {
}

dependencies {
implementation "com.github.readingbat.readingbat-core:readingbat-core:$readingbat_version"
implementation "com.github.readingbat:readingbat-core:$readingbat_version"
implementation "com.github.pambrose.common-utils:core-utils:$utils_version"
implementation "io.github.oshai:kotlin-logging-jvm:$logging_version"
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ org.gradle.configureondemand=true
org.gradle.parallel=true
org.gradle.caching=true
# Jars
logging_version=7.0.0
readingbat_version=1.40.0
utils_version=2.1.0
logging_version=7.0.3
readingbat_version=1.40.7
utils_version=2.3.2
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit a450a35

Please sign in to comment.