anthonycicc/android-finance-tracker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated a whole bunch of dependencies, nixed the support library

Browse source
This commit is contained in:
acicchetti 2018-11-02 12:59:45 -04:00
parent 792480fe65
commit fb7eb0197c
6 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/build.gradle
View file

@ -45,7 +45,8 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-api:${DependencyVersions.Jupiter}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${DependencyVersions.Jupiter}"
implementation "com.android.support:design:${DependencyVersions.Android.SupportLibrary}"
// implementation "com.android.support:design:${DependencyVersions.Android.SupportLibrary}"
implementation 'com.google.android.material:material:1.0.0-rc01'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout-solver:1.1.3'
implementation 'com.google.android.material:material:1.0.0'

4
app/gradle.properties
View file

@ -1 +1,3 @@
org.gradle.configureondemand=false
org.gradle.configureondemand=false
android.useAndroidX=true
android.enableJetifier=true

2
app/src/main/res/layout/activity_main.xml
View file

@ -22,7 +22,7 @@
<include layout="@layout/content_main" />
<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
buildSrc/build.gradle.kts
View file

@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
java
kotlin("jvm") version "1.2.61"
kotlin("jvm") version "1.3.0"
}
repositories {
@ -11,7 +11,7 @@ repositories {
}
val android_gradle_plugin_version = "3.2.0"
val kotlin_version = "1.2.61"
val kotlin_version = "1.3.0"
dependencies {
implementation("com.android.tools.build:gradle:$android_gradle_plugin_version")

4
buildSrc/src/main/kotlin/com/anthonycicchetti/financetracker/DependencyVersions.kt
View file

@ -1,10 +1,10 @@
package com.anthonycicchetti.financetracker
object DependencyVersions {
const val Kotlin = "1.2.70"
const val Kotlin = "1.3.0"
const val Jupiter = "5.2.0"
const val Jackson = "2.9.6"
const val Jackson = "2.9.7"
object Server {
const val Capsule = "1.0.2"

3
common/build.gradle.kts
View file

@ -17,6 +17,7 @@ repositories {
dependencies {
api("com.fasterxml.jackson.module:jackson-module-kotlin:${DependencyVersions.Jackson}")
api("org.jetbrains.kotlin:kotlin-reflect:${DependencyVersions.Kotlin}")
testImplementation("org.junit.jupiter:junit-jupiter-api:${DependencyVersions.Jupiter}")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${DependencyVersions.Jupiter}")
@ -30,4 +31,4 @@ tasks.withType<KotlinCompile> {
tasks.named<Test>("test"){
useJUnitPlatform()
}
}