Skip to content

Commit 38e47ec

Browse files
committed
Upgrades for 2024
1 parent f77d9db commit 38e47ec

File tree

12 files changed

+331
-218
lines changed

12 files changed

+331
-218
lines changed

.devcontainer/Dockerfile

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM mcr.microsoft.com/devcontainers/java:17
2+
3+
# Install additional dependencies
4+
# gettext for envsubst
5+
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
6+
&& apt-get -y install --no-install-recommends \
7+
curl \
8+
wget \
9+
git \
10+
unzip \
11+
gettext \
12+
&& apt-get clean \
13+
&& rm -rf /var/lib/apt/lists/*
14+
15+
# Install Kotlin and Gradle using the pre-installed SDKMAN
16+
RUN bash -c ". /usr/local/sdkman/bin/sdkman-init.sh \
17+
&& sdk install kotlin \
18+
&& sdk install gradle"
19+
20+
# Add to PATH
21+
ENV PATH="$PATH:/usr/local/sdkman/candidates/kotlin/current/bin:/usr/local/sdkman/candidates/gradle/current/bin"
22+
23+
# Add SDKMAN init to zshrc if not already present
24+
RUN grep -qxF 'source /usr/local/sdkman/bin/sdkman-init.sh' /root/.zshrc || echo 'source /usr/local/sdkman/bin/sdkman-init.sh' >> /root/.zshrc
25+
26+
# Set ZSH as the default shell
27+
ENV SHELL /bin/zsh

.devcontainer/devcontainer.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "Kotlin Development",
3+
"build": {
4+
"dockerfile": "Dockerfile"
5+
},
6+
"postCreateCommand": "gradle --version && kotlin -version",
7+
"remoteUser": "vscode"
8+
}

.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+1-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
plugins {
4-
kotlin("jvm") version "1.9.10"
5+
kotlin("jvm") version "2.0.21"
56
application
67
}
78

@@ -32,7 +33,9 @@ tasks.test {
3233
}
3334

3435
tasks.withType<KotlinCompile> {
35-
kotlinOptions.jvmTarget = "11"
36+
compilerOptions {
37+
jvmTarget = JvmTarget.JVM_17
38+
}
3639
}
3740

3841
application {

gradle/wrapper/gradle-wrapper.jar

-15.6 KB
Binary file not shown.
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)