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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
- name: Compile and run AoC 2019
run: |
Expand Down
29 changes: 29 additions & 0 deletions 2019/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
root = true

[*]
indent_style = space
indent_size = 4

end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{kt,kts}]
ij_kotlin_allow_trailing_comma_on_call_site = false
ij_kotlin_allow_trailing_comma = false

ktlint_standard_multiline-expression-wrapping = disabled
ktlint_standard_string-template-indent = disabled
ktlint_standard_no-wildcard-imports = disabled
ktlint_standard_if-else-bracing = disabled
ktlint_standard_multiline-if-else = disabled
ktlint_standard_if-else-wrapping = disabled
ktlint_standard_function-signature = disabled
ktlint_standard_enum-wrapping = disabled
ktlint_standard_blank-line-before-declaration = disabled
ktlint_standard_statement-wrapping = disabled
ktlint_standard_class-signature = disabled
ktlint_standard_chain-method-continuation = disabled
ktlint_standard_condition-wrapping = disabled
ktlint_standard_no-empty-first-line-in-class-body = disabled
3 changes: 2 additions & 1 deletion 2019/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea/**/*
.gradle/**/*
.kotlin/**/*
build/**/*
out/**
out/**
12 changes: 7 additions & 5 deletions 2019/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

group = "me.jp7677"
version = "0.1-SNAPSHOT"

plugins {
application
kotlin("jvm") version "1.7.10"
id("com.adarshr.test-logger") version "3.2.0"
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
kotlin("jvm") version "2.1.21"
id("com.adarshr.test-logger") version "4.0.0"
id("org.jlleitschuh.gradle.ktlint") version "13.1.0"
}

repositories { mavenCentral() }
Expand All @@ -16,8 +18,8 @@ dependencies {
application { mainClass.set("MainKt") }
testlogger { theme = com.adarshr.gradle.testlogger.theme.ThemeType.PLAIN }
tasks.jar { manifest { attributes["Main-Class"] = "MainKt" } }
tasks.compileKotlin { kotlinOptions.jvmTarget = "17" }
tasks.compileTestKotlin { kotlinOptions.jvmTarget = "17" }
tasks.compileKotlin { compilerOptions.jvmTarget.set(JvmTarget.JVM_21) }
tasks.compileTestKotlin { compilerOptions.jvmTarget.set(JvmTarget.JVM_21) }
tasks.test {
useJUnitPlatform()
testLogging { showStandardStreams = true }
Expand Down
Binary file modified 2019/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion 2019/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading