rybalkinsd · alexfmsu · Oct 16, 2018
diff --git a/assignments/04/.gradle/4.10.2/fileHashes/fileHashes.bin b/assignments/04/.gradle/4.10.2/fileHashes/fileHashes.bin
diff --git a/assignments/04/.gradle/4.10.2/fileHashes/fileHashes.lock b/assignments/04/.gradle/4.10.2/fileHashes/fileHashes.lock
diff --git a/assignments/04/.gradle/4.10.2/taskHistory/taskHistory.bin b/assignments/04/.gradle/4.10.2/taskHistory/taskHistory.bin
diff --git a/assignments/04/.gradle/4.10.2/taskHistory/taskHistory.lock b/assignments/04/.gradle/4.10.2/taskHistory/taskHistory.lock
diff --git a/assignments/04/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/assignments/04/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/assignments/04/.gradle/buildOutputCleanup/outputFiles.bin b/assignments/04/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/assignments/04/build.gradle.kts b/assignments/04/build.gradle.kts
@@ -24,6 +24,18 @@ dependencies {
     ktlint("com.github.shyiko", "ktlint", "0.28.0")
 }
 
+val fatJar = task("fatJar", type = Jar::class) {
+    baseName = "${project.name}-fat"
+
+    manifest {    
+        attributes["Main-Class"] = "game.GameKt"
+    }
+
+    from(configurations.runtime.map({ if (it.isDirectory) it else zipTree(it) }))
+
+    with(tasks["jar"] as CopySpec)    
+}
+
 tasks {
     val ktlint by creating(JavaExec::class) {
         group = "verification"
@@ -36,4 +48,8 @@ tasks {
     "check" {
         dependsOn(ktlint)
     }
+
+    "build" {
+        dependsOn(fatJar)
+    }
 }
diff --git a/assignments/04/build/classes/kotlin/main/META-INF/04.kotlin_module b/assignments/04/build/classes/kotlin/main/META-INF/04.kotlin_module
diff --git a/assignments/04/build/classes/kotlin/main/game/Game$Companion.class b/assignments/04/build/classes/kotlin/main/game/Game$Companion.class
diff --git a/assignments/04/build/classes/kotlin/main/game/Game.class b/assignments/04/build/classes/kotlin/main/game/Game.class
diff --git a/assignments/04/build/classes/kotlin/main/game/GameKt.class b/assignments/04/build/classes/kotlin/main/game/GameKt.class
diff --git a/assignments/04/build/classes/kotlin/main/game/WordHandler$Companion.class b/assignments/04/build/classes/kotlin/main/game/WordHandler$Companion.class
diff --git a/assignments/04/build/classes/kotlin/main/game/WordHandler.class b/assignments/04/build/classes/kotlin/main/game/WordHandler.class
diff --git a/assignments/04/build/kotlin/0410SNAPSHOTjar-classes.txt b/assignments/04/build/kotlin/0410SNAPSHOTjar-classes.txt
@@ -0,0 +1 @@
+/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/Game$Companion.class:/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/Game.class:/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/GameKt.class:/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/WordHandler$Companion.class:/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/WordHandler.class
diff --git a/assignments/04/build/kotlin/compileKotlin/build-history.bin b/assignments/04/build/kotlin/compileKotlin/build-history.bin
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream b/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream
diff --git a/...nments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len b/...nments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.keystream.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i b/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/...04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream b/...04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream
diff --git a/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len b/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len
diff --git a/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len b/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len
diff --git a/...04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at b/...04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at
diff --git a/...gnments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i b/...gnments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i
diff --git a/...nts/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len b/...nts/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.keystream.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab.values.at
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab_i b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab_i
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/constants.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/...04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/...04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
diff --git a/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/...uild/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
diff --git a/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
diff --git a/...04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/...04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/...gnments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/...gnments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
diff --git a/...nts/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len b/...nts/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream
diff --git a/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len b/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.keystream.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.keystream.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream b/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream
diff --git a/...s/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len b/...s/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.len
diff --git a/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/...ments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -0,0 +1,2 @@
+4
+3
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.keystream.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i.len b/assignments/04/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i.len
diff --git a/assignments/04/build/kotlin/compileKotlin/data-container-format-version.txt b/assignments/04/build/kotlin/compileKotlin/data-container-format-version.txt
@@ -0,0 +1 @@
+3011001
diff --git a/assignments/04/build/kotlin/compileKotlin/format-version.txt b/assignments/04/build/kotlin/compileKotlin/format-version.txt
@@ -0,0 +1 @@
+9011001
diff --git a/assignments/04/build/kotlin/compileKotlin/gradle-format-version.txt b/assignments/04/build/kotlin/compileKotlin/gradle-format-version.txt
@@ -0,0 +1 @@
+4011001
diff --git a/assignments/04/build/kotlin/compileKotlin/last-build.bin b/assignments/04/build/kotlin/compileKotlin/last-build.bin
diff --git a/assignments/04/build/libs/04-fat-1.0-SNAPSHOT.jar b/assignments/04/build/libs/04-fat-1.0-SNAPSHOT.jar
diff --git a/assignments/04/build/tmp/fatJar/MANIFEST.MF b/assignments/04/build/tmp/fatJar/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: game.GameKt
+
diff --git a/assignments/04/build/tmp/jar/MANIFEST.MF b/assignments/04/build/tmp/jar/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
diff --git a/assignments/04/build/tmp/jar2/MANIFEST.MF b/assignments/04/build/tmp/jar2/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: game.GameKt
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/Game$Companion.class:/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/Game.class:/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/GameKt.class:/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/WordHandler$Companion.class:/home/alexfmsu/Git/kotlin-boot-camp/assignments/04/build/classes/kotlin/main/game/WordHandler.class