diff --git a/.idea/misc.xml b/.idea/misc.xml index 75dac50..e257cd1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index e3bbedd..a097298 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,11 +7,11 @@ apply plugin: 'kotlin-android-extensions' android { signingConfigs { } - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "online.anthonycicchetti.financetracker" minSdkVersion 24 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -32,10 +32,11 @@ dependencies { implementation project(':common') implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:design:27.1.0' + implementation 'androidx.appcompat:appcompat:1.0.0-beta01' + implementation 'androidx.constraintlayout:constraintlayout-solver:1.1.2' + implementation 'com.google.android.material:material:1.0.0-beta01' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.0-alpha3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha3' } diff --git a/app/src/main/java/online/anthonycicchetti/financetracker/MainActivity.kt b/app/src/main/java/online/anthonycicchetti/financetracker/MainActivity.kt index faf1589..c579c61 100644 --- a/app/src/main/java/online/anthonycicchetti/financetracker/MainActivity.kt +++ b/app/src/main/java/online/anthonycicchetti/financetracker/MainActivity.kt @@ -1,10 +1,11 @@ package online.anthonycicchetti.financetracker import android.os.Bundle -import android.support.design.widget.Snackbar -import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.Toolbar +import com.google.android.material.snackbar.Snackbar import Transaction import Money diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 94b561b..d148497 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - - + android:text="Hello World!" /> - + diff --git a/build.gradle b/build.gradle index 3e81f49..3b1c14e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.41' + ext.kotlin_version = '1.2.51' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -21,7 +21,7 @@ allprojects { jcenter() } - ext.kotlin_version = '1.2.41' + ext.kotlin_version = '1.2.51' } subprojects.findAll { it.name.equalsIgnoreCase("common") or it.name.equalsIgnoreCase("server")}.each { p -> @@ -37,8 +37,8 @@ subprojects.findAll { it.name.equalsIgnoreCase("common") or it.name.equalsIgnore because 'This is required by Jackson' } - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.2.0' } test { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961f..0d4a951 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 16d2805..a95009c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists