From aa0c83a55f300804626d69e08fb9ef1a3f686572 Mon Sep 17 00:00:00 2001 From: Kevin Gorham Date: Wed, 28 Nov 2018 18:15:36 -0500 Subject: [PATCH] version updates --- build.gradle | 13 ++++++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 2d73b5a5e..6bb75e2c9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { 'targetSdkVersion': 28 ] ext.versions = [ - 'kotlin': '1.3.0', + 'kotlin': '1.3.10', 'architectureComponents': '2.0.0' ] repositories { @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0-alpha04' + classpath 'com.android.tools.build:gradle:3.4.0-alpha05' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' @@ -29,7 +29,7 @@ apply plugin: 'com.github.ben-manes.versions' apply plugin: 'com.github.dcendents.android-maven' group = 'cash.z.android.wallet' -version = '1.1.2' +version = '1.2.0' repositories { google() @@ -42,8 +42,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 28 - versionCode = 1_01_02 - versionName = "1.1.2" + versionCode = 1_02_00 + versionName = "1.2.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -73,8 +73,11 @@ dependencies { kapt "androidx.lifecycle:lifecycle-compiler:${versions.architectureComponents}" kapt "androidx.room:room-compiler:${versions.architectureComponents}" + // Other implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" implementation "com.android.support:appcompat-v7:28.0.0" + + // Tests testImplementation "junit:junit:4.12" androidTestImplementation "androidx.test:runner:1.1.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.1.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 32e7c5e1c..5afca976a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-milestone-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip