Skip to content

Commit e6d9982

Browse files
authored
Merge pull request #177 from navikt/bumps
bumps og endre deprecated kode
2 parents 00302e0 + 8a1f6e3 commit e6d9982

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

Diff for: build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
22

33
plugins {
4-
val kotlinVersion = "2.1.0"
4+
val kotlinVersion = "2.1.10"
55
val shadowVersion = "8.1.1"
66
val versionsVersion = "0.52.0"
77

Diff for: gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

Diff for: gradlew

+4-2
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/.
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# 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
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

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

Diff for: gradlew.bat

+2
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 ##########################################################################

Diff for: src/main/kotlin/no/nav/dekoratoren/api/config/Bootstrap.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import io.ktor.serialization.jackson.jackson
88
import io.ktor.server.application.Application
99
import io.ktor.server.application.ApplicationStopping
1010
import io.ktor.server.application.install
11+
import io.ktor.server.engine.*
1112
import io.ktor.server.metrics.micrometer.MicrometerMetrics
1213
import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
1314
import io.ktor.server.plugins.cors.routing.CORS
@@ -65,7 +66,7 @@ fun Application.mainModule() {
6566
}
6667

6768
private fun Application.configureShutdownHook(httpClient: HttpClient) {
68-
environment.monitor.subscribe(ApplicationStopping) {
69+
monitor.subscribe(ApplicationStopping) {
6970
httpClient.close()
7071
}
7172
}

0 commit comments

Comments
 (0)