Added syncLibs command, does DependencyVersions way better.

Also reformatted lots of code, to follow guidelines

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/gradle.xml

@@ -6,7 +6,7 @@
         <option name="distributionType" value="WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="C:/Gradle/gradle-4.0.1" />
-        <option name="gradleJvm" value="JDK 8" />
+        <option name="gradleJvm" value="1.8 Adopt" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,7 +17,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useAutoImport" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -5,26 +5,37 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="10">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="9">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8 OpenJDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -1,5 +1,3 @@
-import com.anthonycicchetti.financetracker.DependencyVersions
-
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
@@ -39,17 +37,20 @@ dependencies {
     implementation project(':common')
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${DependencyVersions.Kotlin}"
+    implementation(Libs.kotlin_stdlib_jdk8)
-  implementation "org.jetbrains.kotlin:kotlin-reflect:${DependencyVersions.Kotlin}"
+    implementation(Libs.kotlin_reflect)
 
-  testImplementation "org.junit.jupiter:junit-jupiter-api:${DependencyVersions.Jupiter}"
+    testImplementation(Libs.junit_jupiter_api)
-  testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${DependencyVersions.Jupiter}"
+    testRuntimeOnly(Libs.junit_jupiter_engine)
 
 //  implementation "com.android.support:design:${DependencyVersions.Android.SupportLibrary}"
-  implementation 'com.google.android.material:material:1.0.0-rc01'
+    implementation(Libs.material)
-  implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation(Libs.appcompat)
-  implementation 'androidx.constraintlayout:constraintlayout-solver:1.1.3'
+    implementation(Libs.constraintlayout_solver)
-  implementation 'com.google.android.material:material:1.0.0'
+    androidTestImplementation(Libs.androidx_test_runner)
-  androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation(Libs.espresso_core)
-  androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }
+
+//tasks.named<Delete>("clean") {
+//  delete(rootProject.buildDir)
+//}

app/src/main/java/online/anthonycicchetti/financetracker/MainActivity.kt

@@ -20,7 +20,16 @@ class MainActivity : AppCompatActivity() {
         setSupportActionBar(toolbar)
 
         fab.setOnClickListener { view ->
-            Snackbar.make(view, Transaction(Money(3020), category = "Transportation", location = "Arian's", timestamp = "Jan 01, 2018 00:00").toString(), Snackbar.LENGTH_LONG)
+            Snackbar.make(
+                view,
+                Transaction(
+                    Money(3020),
+                    category = "Transportation",
+                    location = "Arian's",
+                    timestamp = "Jan 01, 2018 00:00"
+                ).toString(),
+                Snackbar.LENGTH_LONG
+            )
                 .setAction("Action", null).show()
         }
     }

build.gradle

@@ -1,21 +0,0 @@
-import com.anthonycicchetti.financetracker.DependencyVersions
-
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-  repositories {
-    google()
-    jcenter()
-  }
-  dependencies {
-    classpath "com.android.tools.build:gradle:${DependencyVersions.Android.Gradle}"
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${DependencyVersions.Kotlin}"
-
-    // NOTE: Do not place your application dependencies here; they belong
-    // in the individual module build.gradle files
-  }
-}
-
-task clean(type: Delete) {
-  delete rootProject.buildDir
-}

build.gradle.kts

@@ -0,0 +1,19 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath(Libs.com_android_tools_build_gradle)
+        classpath(Libs.kotlin_gradle_plugin)
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+plugins {
+    id("jmfayard.github.io.gradle-kotlin-dsl-libs") version "0.2.6" // $ ./gradlew syncLibs
+}

buildSrc/.gitignore

@@ -0,0 +1,3 @@
+
+.gradle/
+build/

buildSrc/build.gradle.kts

@@ -10,7 +10,7 @@ repositories {
     google()
 }
 
-val android_gradle_plugin_version = "3.2.0"
+val android_gradle_plugin_version = "3.2.1"
 val kotlin_version = "1.3.0"
 
 dependencies {

buildSrc/src/main/kotlin/Libs.kt

@@ -0,0 +1,90 @@
+import kotlin.String
+
+/**
+ * Generated by [gradle-kotlin-dsl-libs](https://github.com/jmfayard/gradle-kotlin-dsl-libs)
+ *
+ * Run again
+ *   `$ ./gradlew syncLibs`
+ * to update this file */
+object Libs {
+    /**
+     * [appcompat website](http://developer.android.com/tools/extras/support-library.html) */
+    const val appcompat: String = "androidx.appcompat:appcompat:" + Versions.appcompat
+
+    /**
+     * [constraintlayout-solver website](http://tools.android.com) */
+    const val constraintlayout_solver: String =
+        "androidx.constraintlayout:constraintlayout-solver:" + Versions.constraintlayout_solver
+
+    /**
+     * [espresso-core website](https://developer.android.com/testing) */
+    const val espresso_core: String =
+        "androidx.test.espresso:espresso-core:" + Versions.espresso_core
+
+    /**
+     * [runner website](https://developer.android.com/testing) */
+    const val androidx_test_runner: String = "androidx.test:runner:" + Versions.androidx_test_runner
+
+    /**
+     * [aapt2 website](https://developer.android.com/studio) */
+    const val aapt2: String = "com.android.tools.build:aapt2:" + Versions.aapt2
+
+    const val com_android_tools_build_gradle: String =
+        "com.android.tools.build:gradle:" + Versions.com_android_tools_build_gradle
+
+    /**
+     * [lint-gradle website](https://developer.android.com/studio) */
+    const val lint_gradle: String = "com.android.tools.lint:lint-gradle:" + Versions.lint_gradle
+
+    /**
+     * [jackson-module-kotlin website](https://github.com/FasterXML/jackson-module-kotlin) */
+    const val jackson_module_kotlin: String =
+        "com.fasterxml.jackson.module:jackson-module-kotlin:" + Versions.jackson_module_kotlin
+
+    const val shadow: String = "com.github.jengelman.gradle.plugins:shadow:" + Versions.shadow
+
+    const val com_github_johnrengelman_shadow_gradle_plugin: String =
+        "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:" + Versions.com_github_johnrengelman_shadow_gradle_plugin
+
+    /**
+     * [material website](http://developer.android.com/tools/extras/support-library.html) */
+    const val material: String = "com.google.android.material:material:" + Versions.material
+
+    const val jmfayard_github_io_gradle_kotlin_dsl_libs_gradle_plugin: String =
+        "jmfayard.github.io.gradle-kotlin-dsl-libs:jmfayard.github.io.gradle-kotlin-dsl-libs.gradle.plugin:" + Versions.jmfayard_github_io_gradle_kotlin_dsl_libs_gradle_plugin
+
+    /**
+     * [kotlin-android-extensions website](https://kotlinlang.org/) */
+    const val kotlin_android_extensions: String =
+        "org.jetbrains.kotlin:kotlin-android-extensions:" + Versions.org_jetbrains_kotlin
+
+    /**
+     * [kotlin-gradle-plugin website](https://kotlinlang.org/) */
+    const val kotlin_gradle_plugin: String =
+        "org.jetbrains.kotlin:kotlin-gradle-plugin:" + Versions.org_jetbrains_kotlin
+
+    /**
+     * [kotlin-reflect website](https://kotlinlang.org/) */
+    const val kotlin_reflect: String =
+        "org.jetbrains.kotlin:kotlin-reflect:" + Versions.org_jetbrains_kotlin
+
+    /**
+     * [kotlin-scripting-compiler-embeddable website](https://kotlinlang.org/) */
+    const val kotlin_scripting_compiler_embeddable: String =
+        "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + Versions.org_jetbrains_kotlin
+
+    /**
+     * [kotlin-stdlib-jdk8 website](https://kotlinlang.org/) */
+    const val kotlin_stdlib_jdk8: String =
+        "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" + Versions.org_jetbrains_kotlin
+
+    /**
+     * [junit-jupiter-api website](http://junit.org/junit5/) */
+    const val junit_jupiter_api: String =
+        "org.junit.jupiter:junit-jupiter-api:" + Versions.org_junit_jupiter
+
+    /**
+     * [junit-jupiter-engine website](http://junit.org/junit5/) */
+    const val junit_jupiter_engine: String =
+        "org.junit.jupiter:junit-jupiter-engine:" + Versions.org_junit_jupiter
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -0,0 +1,52 @@
+import kotlin.String
+
+/**
+ * Find which updates are available by running
+ *     `$ ./gradlew syncLibs`
+ * This will only update the comments.
+ *
+ * YOU are responsible for updating manually the dependency version. */
+object Versions {
+    const val appcompat: String = "1.0.0"
+
+    const val constraintlayout_solver: String = "1.1.3"
+
+    const val espresso_core: String = "3.1.0"
+
+    const val androidx_test_runner: String = "1.1.0"
+
+    const val aapt2: String = "3.2.0-4818971" //available: "3.2.1-4818971" 
+
+    const val com_android_tools_build_gradle: String = "3.2.1"
+
+    const val lint_gradle: String = "26.2.0" //available: "26.2.1" 
+
+    const val jackson_module_kotlin: String = "2.9.7"
+
+    const val shadow: String = "4.0.2"
+
+    const val com_github_johnrengelman_shadow_gradle_plugin: String = "4.0.2"
+
+    const val material: String = "1.0.0"
+
+    const val jmfayard_github_io_gradle_kotlin_dsl_libs_gradle_plugin: String = "0.2.6"
+
+    const val org_jetbrains_kotlin: String = "1.3.0"
+
+    const val org_junit_jupiter: String = "5.3.1" //available: "5.3.1"
+
+    /**
+     *
+     *   To update Gradle, edit the wrapper file at path:
+     *      ./gradle/wrapper/gradle-wrapper.properties
+     */
+    object Gradle {
+        const val runningVersion: String = "4.10.2"
+
+        const val currentVersion: String = "4.10.2"
+
+        const val nightlyVersion: String = "5.1-20181102000039+0000"
+
+        const val releaseCandidate: String = "5.0-rc-1"
+    }
+}

buildSrc/src/main/kotlin/com/anthonycicchetti/financetracker/DependencyVersions.kt

@@ -1,18 +0,0 @@
-package com.anthonycicchetti.financetracker
-
-object DependencyVersions {
-    const val Kotlin = "1.3.0"
-    const val Jupiter = "5.2.0"
-
-    const val Jackson = "2.9.7"
-
-    object Server {
-        const val Capsule = "1.0.2"
-		const val Shadow = "4.0.2"
-    }
-
-    object Android {
-        const val SupportLibrary = "28.0.0"
-        const val Gradle = "3.2.0"
-    }
-}

common/build.gradle.kts

@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import com.anthonycicchetti.financetracker.DependencyVersions
 
 plugins {
     `java-library`
@@ -16,11 +15,11 @@ repositories {
 }
 
 dependencies {
-    api("com.fasterxml.jackson.module:jackson-module-kotlin:${DependencyVersions.Jackson}")
+    api(Libs.jackson_module_kotlin)
-	api("org.jetbrains.kotlin:kotlin-reflect:${DependencyVersions.Kotlin}")
+    api(Libs.kotlin_reflect)
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:${DependencyVersions.Jupiter}")
+    testImplementation(Libs.junit_jupiter_api)
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${DependencyVersions.Jupiter}")
+    testRuntimeOnly(Libs.junit_jupiter_engine)
 }
 
 tasks.withType<KotlinCompile> {
@@ -32,3 +31,7 @@ tasks.withType<KotlinCompile> {
 tasks.named<Test>("test") {
     useJUnitPlatform()
 }
+
+tasks.named<Delete>("clean") {
+    delete(rootProject.buildDir)
+}

common/src/main/kotlin/Money.kt

@@ -29,11 +29,15 @@ data class Money(@JsonValue private val cents: Int) {
 
             val dollarSplit = splitString.get(0).split('$')
             return if (dollarSplit.get(0) == "-") {
-                fromDollarsAndCents(dollars = dollarSplit.get(1).toInt().unaryMinus(),
+                fromDollarsAndCents(
-                        cents = cents)
+                    dollars = dollarSplit.get(1).toInt().unaryMinus(),
+                    cents = cents
+                )
             } else {
-                fromDollarsAndCents(dollars = dollarSplit.get(1).toInt(),
+                fromDollarsAndCents(
-                        cents = cents)
+                    dollars = dollarSplit.get(1).toInt(),
+                    cents = cents
+                )
             }
         }
     }

common/src/main/kotlin/Transaction.kt

@@ -1,10 +1,12 @@
 import com.fasterxml.jackson.module.kotlin.*
 
-data class Transaction(val cost: Money,
+data class Transaction(
+    val cost: Money,
     val category: String,
     val subcategory: String = "",
     val location: String,
-                       val timestamp: String) {
+    val timestamp: String
+) {
     fun serialize(): String {
         val mapper = jacksonObjectMapper().registerModule(KotlinModule())
         return mapper.writeValueAsString(this)

gradle.properties

@@ -12,6 +12,5 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 org.gradle.configureondemand=false
-
 # Makes gradle run builds in parallel whenever possible
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -28,7 +28,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=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -14,7 +14,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=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

server/build.gradle

@@ -1,43 +0,0 @@
-import com.anthonycicchetti.financetracker.DependencyVersions
-
-buildscript {
-  repositories {
-    mavenCentral()
-	jcenter()
-  }
-  dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${DependencyVersions.Kotlin}"
-	classpath "com.github.jengelman.gradle.plugins:shadow:${DependencyVersions.Server.Shadow}"
-  }
-}
-
-plugins {
-  id 'com.github.johnrengelman.shadow' version '4.0.2'
-  id 'application'
-  id 'kotlin'
-}
-
-
-group 'online.anthonycicchetti'
-version '0.1.0'
-
-mainClassName = 'MainKt'
-
-repositories {
-  mavenCentral()
-  google()
-  jcenter()
-}
-
-dependencies {
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${DependencyVersions.Kotlin}"
-  implementation project(":common")
-}
-
-compileKotlin {
-  kotlinOptions.jvmTarget = "1.8"
-}
-compileTestKotlin {
-  kotlinOptions.jvmTarget = "1.8"
-}
-

server/build.gradle.kts

@@ -0,0 +1,53 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+buildscript {
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+    dependencies {
+        classpath(Libs.kotlin_gradle_plugin)
+        classpath(Libs.shadow)
+    }
+}
+
+plugins {
+    id("com.github.johnrengelman.shadow") version "4.0.2"
+    id("application")
+    id("kotlin")
+}
+
+
+application {
+    group = "com.anthonyciccheti"
+    version = "0.1.0"
+    mainClassName = "MainKt"
+}
+
+repositories {
+    mavenCentral()
+    google()
+    jcenter()
+}
+
+dependencies {
+    implementation(Libs.kotlin_stdlib_jdk8)
+    implementation(project(":common"))
+}
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+tasks.named<Delete>("clean") {
+    delete(rootProject.buildDir)
+}
+

server/settings.gradle

@@ -1,2 +0,0 @@
-rootProject.name = 'server'
-

server/settings.gradle.kts

@@ -0,0 +1,2 @@
+rootProject.name = "server"
+

server/src/main/kotlin/Main.kt

@@ -1,10 +1,19 @@
 fun main(args: Array<String>) {
-    println(Transaction(Money(3020), category = "Transportation", location = "Arian's", timestamp = "Jan 01, 2018 00:00"))
+    println(
+        Transaction(
+            Money(3020),
+            category = "Transportation",
+            location = "Arian's",
+            timestamp = "Jan 01, 2018 00:00"
+        )
+    )
 
-    val t = Transaction.fromJSON("{\"cost\": 2168," +
+    val t = Transaction.fromJSON(
+        "{\"cost\": 2168," +
                 " \"category\": \"Transportation\"," +
                 " \"location\": \"Arian's\"," +
-            " \"timestamp\": \"Jan 01, 2018 00:00\"}")
+                " \"timestamp\": \"Jan 01, 2018 00:00\"}"
+    )
 
     println(t)