Merge branch 'upgrade_deps_2020'

stevesea · Apr 7, 2020 · a8f4014 · a8f4014
2 parents 7f34aae + 99e56e9
commit a8f4014
Show file tree

Hide file tree

Showing 40 changed files with 1,073 additions and 115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,8 @@
 app/fabric.properties
 
 app/prod/release/output\.json
+**/.settings/
+adventuresmith-core/bin
+adventuresmith-cli/bin
+**/.classpath
+**/.project
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,10 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-26.0.2
+    - build-tools-28.0.3
 
     # The SDK version used to compile your project
-    - android-25
+    - android-28
 
     # Additional components
     - extra-google-google_play_services

diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # Adventuresmith
 
-[![Build status](https://circleci.com/gh/stevesea/Adventuresmith.svg?&style=shield&circle-token=d5b638c2be4157b4b3bdd347bd139c392968d7db)](https://circleci.com/gh/stevesea/Adventuresmith)
 [![Build Status](https://travis-ci.org/stevesea/Adventuresmith.svg?branch=master)](https://travis-ci.org/stevesea/Adventuresmith)
 ![Kotlin LoC](https://img.shields.io/badge/Kotlin_LoC-4496-lightgrey.svg)
 ![YaML LoC](https://img.shields.io/badge/YaML_LoC-78808-lightgrey.svg)

diff --git a/adventuresmith-cli/.gitignore b/adventuresmith-cli/.gitignore
@@ -1 +1,2 @@
 /build
+/bin
diff --git a/adventuresmith-cli/build.gradle b/adventuresmith-cli/build.gradle
@@ -42,17 +42,19 @@ task copyMainResources(type: Copy) {
 copyTestResources.dependsOn copyMainResources
 
 dependencies {
-    compile project(':adventuresmith-core')
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(':adventuresmith-core')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     // for CLI, we'll use logback
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: logback_version
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: logback_version
+    implementation "io.github.microutils:kotlin-logging:$kotlin_logging_version"
+    implementation "com.github.salomonbrys.kodein:kodein:$kodein_version"
 
-    compile group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: argparse4j_version
+    implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: argparse4j_version
 
-    testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_7
@@ -93,4 +95,4 @@ task(runGenerateDocs, dependsOn: 'classes', type: JavaExec) {
     args = ['core-docs','-o','../content_attribution.md']
 }
 
-check.dependsOn detekt
+check.dependsOn detekt
diff --git a/adventuresmith-core/.gitignore b/adventuresmith-core/.gitignore
@@ -1 +1,2 @@
 /build
+/bin
diff --git a/adventuresmith-core/build.gradle b/adventuresmith-core/build.gradle
@@ -44,33 +44,33 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "com.github.salomonbrys.kodein:kodein:$kodein_version"
+    api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    api "com.github.salomonbrys.kodein:kodein:$kodein_version"
 
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
+    api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
-    compile "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version"
-    compile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version"
+    api "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    api "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_version"
+    api "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version"
 
     // use a couple things from guava (resource cache and other things)
-    compile group: 'com.google.guava', name: 'guava', version: guava_version
-    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '2.0.1'
+    api group: 'com.google.guava', name: 'guava', version: guava_version
+    api group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
 
-    compile "com.samskivert:jmustache:$jmustache_version"
+    api "com.samskivert:jmustache:$jmustache_version"
 
     // framework for dice expression parser
-    compile "me.sargunvohra.lib:cakeparse:$cakeparse_version"
-    compile "io.github.microutils:kotlin-logging:$kotlin_logging_version"
+    api "me.sargunvohra.lib:cakeparse:$cakeparse_version"
+    api "io.github.microutils:kotlin-logging:$kotlin_logging_version"
 
-    testCompile "junit:junit:$junit_version"
-    testCompile "org.mockito:mockito-core:$mockito_version"
-    testCompile "com.nhaarman:mockito-kotlin:$mockito_kotlin_version"
-    testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logback_version
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "org.mockito:mockito-core:$mockito_version"
+    testImplementation "com.nhaarman:mockito-kotlin:$mockito_kotlin_version"
+    testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: logback_version
 }
 
-check.dependsOn detekt
+check.dependsOn detekt
diff --git a/adventuresmith-core/src/main/kotlin/org/stevesea/adventuresmith/core/Generator.kt b/adventuresmith-core/src/main/kotlin/org/stevesea/adventuresmith/core/Generator.kt
@@ -775,6 +775,7 @@ class DataDrivenDtoTemplateProcessor(override val kodein: Kodein) : KodeinAware,
         var count = 0
         do {
             try {
+                logger.debug("$count : $result")
                 result = compiler
                         .compile(result)
                         .execute(context)

diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/collections.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/collections.yml
@@ -12,6 +12,7 @@ collections:
 - gma
 - hack_and_slash
 - kaigaku
+- knave
 - macchiato_monsters
 - maze_rats
 - mutant_year_zero

diff --git a/...resmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/character.meta.yml b/...resmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/character.meta.yml
@@ -0,0 +1,2 @@
+---
+name: Character
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/character.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/character.yml
@@ -0,0 +1,31 @@
+---
+templates:
+  - |
+    {{>set: char_str {{>rollKeepLow: 3 1 1d6}}}}
+    {{>set: char_dex {{>rollKeepLow: 3 1 1d6}}}}
+    {{>set: char_con {{>rollKeepLow: 3 1 1d6}}}}
+    {{>set: char_int {{>rollKeepLow: 3 1 1d6}}}}
+    {{>set: char_wis {{>rollKeepLow: 3 1 1d6}}}}
+    {{>set: char_cha {{>rollKeepLow: 3 1 1d6}}}}
+    {{>set: char_hp {{>roll: 1d8}}}}
+    %[[char_template]]%
+
+definitions:
+  char_template: |
+
+    <h5>Character - {{names.name}}</h5>
+    {{labels.str}}{{>roll: 10+{{>get: char_str}}}}&nbsp;(+{{>get: char_str}})&nbsp;&nbsp;&nbsp;&nbsp;
+    {{labels.dex}}{{>roll: 10+{{>get: char_dex}}}}&nbsp;(+{{>get: char_dex}})&nbsp;&nbsp;&nbsp;&nbsp;
+    {{labels.con}}{{>roll: 10+{{>get: char_con}}}}&nbsp;(+{{>get: char_con}})
+    <br/>
+    {{labels.int}}{{>roll: 10+{{>get: char_int}}}}&nbsp;(+{{>get: char_int}})&nbsp;&nbsp;&nbsp;&nbsp;
+    {{labels.wis}}{{>roll: 10+{{>get: char_wis}}}}&nbsp;(+{{>get: char_wis}})&nbsp;&nbsp;&nbsp;&nbsp;
+    {{labels.cha}}{{>roll: 10+{{>get: char_cha}}}}&nbsp;(+{{>get: char_cha}})
+
+    <br/><br/>{{labels.defense}} %[[>get: armor_def]]% (+%[[>roll: %[[>get: armor_def]]%-10]]%)
+    <br/><br/>{{labels.hp}}{{>get: char_hp}}
+    <br/><br/>{{traits_template}}
+    <br/><br/>{{starting_gear_template}}
+
+imports:
+  - knave_base
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/collection.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/collection.yml
@@ -0,0 +1,11 @@
+id: knave
+icon: cmd_skull
+
+generators:
+  - character
+  - traits
+  - gear
+  - spell
+  - name
+  - reaction
+
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/gear.meta.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/gear.meta.yml
@@ -0,0 +1,2 @@
+---
+name: Starting Gear
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/gear.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/knave/gear.yml
@@ -0,0 +1,9 @@
+---
+
+templates:
+  - |
+    <h5>Starting Gear</h5>
+    {{starting_gear_template}}
+
+imports:
+  - knave_base