diff --git a/build.gradle.kts b/build.gradle.kts index ee60c75..aeb7167 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,6 +2,7 @@ plugins { kotlin("jvm") version "1.3.61" application kotlin("kapt") version "1.3.61" + id("com.github.johnrengelman.shadow") version "5.2.0" } group = "dev.acicchetti" @@ -18,12 +19,19 @@ repositories { val arrowVersion = "0.10.3" dependencies { implementation(kotlin("stdlib-jdk8")) + + implementation("com.github.ajalt:clikt:2.3.0") + implementation("io.arrow-kt:arrow-core:$arrowVersion") implementation("io.arrow-kt:arrow-syntax:$arrowVersion") implementation("io.arrow-kt:arrow-optics:$arrowVersion") kapt("io.arrow-kt:arrow-meta:$arrowVersion") } +application { + mainClassName = "CliParserKt" +} + tasks { compileKotlin { kotlinOptions.jvmTarget = "1.8" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738c..5c2d1cf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index af6708f..83f2acf 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -109,8 +125,8 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..9618d8d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/justfile b/justfile new file mode 100644 index 0000000..0420f39 --- /dev/null +++ b/justfile @@ -0,0 +1,5 @@ +run day inputFile: build + java -jar ./build/libs/adventOfCode2019-1.0-SNAPSHOT-all.jar --day-to-run={{day}} --input-file={{inputFile}} + +build: + ./gradlew clean shadowJar diff --git a/src/main/kotlin/CliParser.kt b/src/main/kotlin/CliParser.kt new file mode 100644 index 0000000..6efb328 --- /dev/null +++ b/src/main/kotlin/CliParser.kt @@ -0,0 +1,25 @@ +import com.github.ajalt.clikt.core.CliktCommand +import com.github.ajalt.clikt.parameters.options.option +import com.github.ajalt.clikt.parameters.options.required +import com.github.ajalt.clikt.parameters.types.path +import day1.Day1 +import java.nio.file.Path +import kotlin.RuntimeException + +class CliParser: CliktCommand() { + private val dayToRun: String by option(help = "Day to Run. Can be either an int (1) or a String (Day1)").required() + private val inputFile: Path by option().path().required() + + override fun run() { + println("dayToRun = $dayToRun") + println("inputFile = $inputFile") + when(dayToRun.replace("Day", "")) { + "1" -> println(Day1().run(inputFile)) + else -> throw RuntimeException("Day not implementation yet") + } + } +} + +fun main(args: Array) { + CliParser().main(args) +} \ No newline at end of file diff --git a/src/main/kotlin/day1/Day1.kt b/src/main/kotlin/day1/Day1.kt index f15ad66..1848a4d 100644 --- a/src/main/kotlin/day1/Day1.kt +++ b/src/main/kotlin/day1/Day1.kt @@ -2,11 +2,16 @@ package day1 import java.nio.file.Files import java.nio.file.Path +import java.util.stream.Collectors class Day1 { - fun loadFile(inputFile: Path): List { - return Files.readAllLines(inputFile) + fun run(inputFile: Path): Long { + return loadFile(inputFile).parallelStream() + .map { it.toLong().div(3).minus(2) } + .collect(Collectors.summingLong { it } ) } - + private fun loadFile(inputFile: Path): List { + return Files.readAllLines(inputFile) + } }