Skip to content

Commit

Permalink
Oppgrader gradlew + pynt i gradle skript
Browse files Browse the repository at this point in the history
  • Loading branch information
ahusby committed Dec 29, 2024
1 parent 10a7af6 commit ce9936c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
deploy-to-dev:
name: Deploy to dev
needs: call-build-java-gradlew
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/reusable-workflow'
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/oppgrader-avhengigheter'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
8 changes: 1 addition & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
/** Det er minst sannsynlighet for dependency-plunder når vi bruker samme versjon av Kotlin som den som er bundlet med Gradle via gradlew.
For å se hvilken versjon det er, kjør "./gradlew --version".
Kotlin-versjonen oppgraderes slik: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:upgrading_wrapper
*/
val kotlinCodeStyle = "official"
val logbackVersion = "1.4.4"
val ktorVersion = "2.1.3"
val ktorLesserVersion = "1.6.8"
Expand All @@ -20,7 +15,6 @@ val mockkVersion = "1.13.2"
val kafkaAvroSerializerVersion = "7.3.0"
val shedlockVersion = "4.42.0"
val pitestVersion = "1.9.0"
val elasticSearchClientVersion = "7.10.1"
val kotlinLoggingVersion = "2.0.11"
val jsonassertVersion = "1.5.1"
val mockOAuth2ServerVersion = "0.5.6"
Expand All @@ -29,7 +23,7 @@ val avroVersion = "1.11.1"

plugins {
application
kotlin("jvm") version embeddedKotlinVersion // Kotlinversjon styres av gradlew, se https://blog.nishtahir.com/how-to-properly-update-the-gradle-wrapper/
kotlin("jvm") version "2.1.0"
id("com.github.ben-manes.versions") version "0.43.0"
id("com.github.davidmc24.gradle.plugin.avro") version "1.5.0"
id("info.solidsoft.pitest") version "1.9.0"
Expand Down
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.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down

0 comments on commit ce9936c

Please sign in to comment.