From 54952348f83699d32ee2f1d331257c5b62521dfc Mon Sep 17 00:00:00 2001 From: Billy Brawner Date: Mon, 1 Oct 2018 17:52:24 -0500 Subject: [PATCH] Update gradle wrapper and dependencies --- IAP5Helper/build.gradle | 6 +++--- app/build.gradle | 18 +++++++++--------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/IAP5Helper/build.gradle b/IAP5Helper/build.gradle index 07c7c88..333d65e 100644 --- a/IAP5Helper/build.gradle +++ b/IAP5Helper/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.2' defaultConfig { minSdkVersion 14 - targetSdkVersion 15 + targetSdkVersion 28 } buildTypes { diff --git a/app/build.gradle b/app/build.gradle index df29cdd..54d05cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { exclude 'META-INF/LICENSE' exclude 'META-INF/DEPENDENCIES' } - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.2' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -20,7 +20,7 @@ android { defaultConfig { applicationId "com.wbrawner.simplemarkdown" minSdkVersion 19 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 13 versionName "0.4.7" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -51,7 +51,7 @@ android { ext { firebase_version = '16.1.0' - support_version = "27.1.0" + support_version = "28.0.0" } dependencies { @@ -68,12 +68,12 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3' implementation "com.android.support:appcompat-v7:$support_version" - implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation "com.android.support:design:$support_version" implementation "com.android.support:support-v13:$support_version" implementation 'com.commonsware.cwac:anddown:0.3.0' @@ -81,8 +81,8 @@ dependencies { implementation 'com.jakewharton:butterknife:8.7.0' implementation 'com.jakewharton.rxbinding2:rxbinding:2.0.0' implementation 'com.jakewharton.rxbinding2:rxbinding-design:2.0.0' - implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' - implementation 'io.reactivex.rxjava2:rxjava:2.1.0' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' + implementation 'io.reactivex.rxjava2:rxjava:2.2.2' implementation "com.google.firebase:firebase-core:16.0.3" implementation "com.google.firebase:firebase-perf:$firebase_version" samsungImplementation project(":IAP5Helper") diff --git a/build.gradle b/build.gradle index 20b741a..130b95c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files classpath 'com.google.gms:google-services:4.0.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 78a9504..215146a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 20 19:40:47 CDT 2018 +#Mon Oct 01 17:32:53 CDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip