Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
.PHONY: default help clean build lint format detekt detekt-baseline tests uberjar uber \
cc run heroku logs versioncheck upgrade-wrapper _require-gradle-version
cc run heroku logs versions upgrade-wrapper _require-gradle-version

GRADLE_VERSION := $(shell awk -F'"' '/^gradle[[:space:]]*=/ {print $$2}' gradle/libs.versions.toml)
GRADLE_VERSION := $(shell sed -n 's/^gradle-wrapper = "\(.*\)"/\1/p' gradle/libs.versions.toml)

default: versioncheck
default: help

help: ## Show this help
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf " \033[36m%-22s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
help: ## Show this help (list of targets)
@awk 'BEGIN {FS = ":.*?## "; printf "Usage: make <target>\n\nTargets:\n"} \
/^[a-zA-Z0-9_-]+:.*?## / {printf " \033[36m%-22s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)

clean: ## Remove build artifacts
./gradlew clean
Expand Down Expand Up @@ -50,8 +51,8 @@ logs: ## Tail Heroku logs
# Gradle's documented upgrade procedure: the first run rewrites
# gradle-wrapper.properties using the *old* wrapper jar; the second run
# regenerates the wrapper itself with the new version.
versioncheck: ## Check for dependency updates (default target)
./gradlew dependencyUpdates
versions: ## Check for dependency updates (default target)
./gradlew dependencyUpdates --no-configuration-cache --no-parallel

upgrade-wrapper: _require-gradle-version ## Upgrade Gradle wrapper to version in libs.versions.toml
./gradlew wrapper --gradle-version=$(GRADLE_VERSION) --distribution-type=bin
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
detekt = "2.0.0-alpha.3"
gradle = "9.5.0"
gradle-wrapper = "9.5.1"
jvm = "17"
kotest = "6.1.11"
kotlin = "2.3.21"
kotlinter = "5.4.2"
ktor = "3.4.3"
logging = "8.0.02"
kotlin = "2.4.0"
kotlinter = "5.5.0"
ktor = "3.5.0"
logging = "8.0.4"
readingbat = "3.1.8"
utils = "2.8.2"
utils = "2.9.0"
versions = "0.54.0"

[libraries]
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 10 additions & 21 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ dependencyResolutionManagement {
}

rootProject.name = 'readingbat-python-content'

Loading