From af619e182e63a1088af510f67992098cd44e3dec Mon Sep 17 00:00:00 2001 From: shunjikonishi Date: Thu, 15 Mar 2018 23:16:19 +0900 Subject: [PATCH 1/7] For track --- README_ja.md | 2 +- build.sbt | 2 +- cli-template.yml | 6 +++++- project/plugins.sbt | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README_ja.md b/README_ja.md index b8b9284..134c19b 100644 --- a/README_ja.md +++ b/README_ja.md @@ -1,6 +1,6 @@ # コマンドラインアプリケーション(CLI アプリ)作成用テンプレート(Scala) -[Main.scala](src/main/scala/Main.java)を編集して、CLIアプリを実装してください。 +[Main.scala](src/main/scala/Main.scala)を編集して、CLIアプリを実装してください。 チャレンジ内でファイルの作成が許可されていれば、可読性等のためにファイルを分割する事も可能です。 ## コマンドライン引数の取得方法 diff --git a/build.sbt b/build.sbt index f4c22b6..a94da1c 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := """theapp""" version := "1.0" -scalaVersion := "2.11.8" +scalaVersion := "2.12.4" resolvers += Resolver.sonatypeRepo("public") enablePlugins(JavaAppPackaging) diff --git a/cli-template.yml b/cli-template.yml index de65592..cf73d80 100644 --- a/cli-template.yml +++ b/cli-template.yml @@ -1,9 +1,13 @@ build: - sbt stage files: - - .gitignore - build.sbt - project/plugins.sbt - src/main/scala/Main.scala main: src/main/scala/Main.scala command: target/universal/stage/bin/theapp +envConf: + imageName: "givery/track-scala-2.12" + cacheDirs: + - "/root/.ivy2" + - "/root/.sbt" diff --git a/project/plugins.sbt b/project/plugins.sbt index b0d89ac..44cfb3f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4") \ No newline at end of file +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.3") From 2dad74f1ec6783cab20c89b9eae7fd53e3a42a0b Mon Sep 17 00:00:00 2001 From: shunjikonishi Date: Fri, 16 Mar 2018 18:49:03 +0900 Subject: [PATCH 2/7] Forgot to add --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 68a5025..1bbb94e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Command line application template for Scala -Implement CLI application by editing [App.java](src/main/scala/Main.scala) +Implement CLI application by editing [Main.scala](src/main/scala/Main.scala) ## How to get input parameters You can get arguments as `args` in `main` method. From 57931a4b6239c719c5bb792bb6f30da477304ad9 Mon Sep 17 00:00:00 2001 From: Shunji Konishi Date: Wed, 6 Jun 2018 17:18:53 +0900 Subject: [PATCH 3/7] Update cli-template.yml --- cli-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-template.yml b/cli-template.yml index cf73d80..cf87036 100644 --- a/cli-template.yml +++ b/cli-template.yml @@ -1,5 +1,5 @@ build: - - sbt stage + - sbt -XX:MaxMetaspaceSize=512M stage files: - build.sbt - project/plugins.sbt From ead99d356a404b53043c04700c1c4460fcf131d6 Mon Sep 17 00:00:00 2001 From: Shunji Konishi Date: Wed, 6 Jun 2018 17:27:45 +0900 Subject: [PATCH 4/7] Update cli-template.yml --- cli-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-template.yml b/cli-template.yml index cf87036..3c890e6 100644 --- a/cli-template.yml +++ b/cli-template.yml @@ -1,5 +1,5 @@ build: - - sbt -XX:MaxMetaspaceSize=512M stage + - sbt -XX:MaxMetaspaceSize=256M stage files: - build.sbt - project/plugins.sbt From 7c4b48f3a9609142bedc332c8309151d89aa5742 Mon Sep 17 00:00:00 2001 From: Shunji Konishi Date: Wed, 6 Jun 2018 17:36:27 +0900 Subject: [PATCH 5/7] Update cli-template.yml --- cli-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-template.yml b/cli-template.yml index 3c890e6..a545d6b 100644 --- a/cli-template.yml +++ b/cli-template.yml @@ -1,5 +1,5 @@ build: - - sbt -XX:MaxMetaspaceSize=256M stage + - SBT_OPTS="-XX:MaxMetaspaceSize=256M" sbt stage files: - build.sbt - project/plugins.sbt From 2dbc7c0e92eb3fb5370219184a7128a528e85b17 Mon Sep 17 00:00:00 2001 From: Shunji Konishi Date: Wed, 6 Jun 2018 17:48:31 +0900 Subject: [PATCH 6/7] Update cli-template.yml --- cli-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-template.yml b/cli-template.yml index a545d6b..e769748 100644 --- a/cli-template.yml +++ b/cli-template.yml @@ -1,5 +1,5 @@ build: - - SBT_OPTS="-XX:MaxMetaspaceSize=256M" sbt stage + - SBT_OPTS="-XX:MaxMetaspaceSize=512M" sbt stage files: - build.sbt - project/plugins.sbt From cbda0213d41672652effbe7479298f3af11aa630 Mon Sep 17 00:00:00 2001 From: Shunji Konishi Date: Wed, 13 Jun 2018 12:16:48 +0900 Subject: [PATCH 7/7] Add -Xmx option to build command --- cli-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli-template.yml b/cli-template.yml index e769748..1c02c65 100644 --- a/cli-template.yml +++ b/cli-template.yml @@ -1,5 +1,5 @@ build: - - SBT_OPTS="-XX:MaxMetaspaceSize=512M" sbt stage + - SBT_OPTS="-Xmx512M -XX:MaxMetaspaceSize=512M" sbt stage files: - build.sbt - project/plugins.sbt