From a2880fcbf412d1c823c6e8872f0cdf7798f2c39e Mon Sep 17 00:00:00 2001 From: Zeyad-37 Date: Tue, 13 Nov 2018 11:24:35 +0200 Subject: [PATCH] upgraded gradle and kotlin, support lib and rxjava, compileSDK & buildtools --- build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 4 ++-- sampleApp/build.gradle | 6 +++--- usecases/build.gradle | 8 ++++---- .../com/zeyad/usecases/api/DataServiceFactoryTest.kt | 3 ++- .../zeyad/usecases/integration/APIIntegrationTest.java | 6 +++--- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index b87ac37..bb3d0a3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ project.ext { - supportLibrary = '27.1.1' + supportLibrary = '28.0.0' rxbinding = '2.1.1' okhttpVersion = '3.11.0' archComp = '1.1.1' room_version = '1.1.1' - rxjava = '2.2.0' + rxjava = '2.2.3' rxAndroid = '2.1.0' - genericRecyclerViewAdapter = '1.9.0' + genericRecyclerViewAdapter = '1.9.1' rxredux = '2.6.0' glide = '4.0.0' lottie = '2.5.0' @@ -31,7 +31,7 @@ project.ext { // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.61' + ext.kotlin_version = '1.3.0' repositories { jcenter() google() @@ -41,7 +41,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version" // classpath 'com.google.gms:google-services:3.1.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7b3fb3c..77e137f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 06 07:56:05 CEST 2018 +#Tue Nov 13 10:53:47 EET 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 diff --git a/sampleApp/build.gradle b/sampleApp/build.gradle index b5ac830..bf22254 100644 --- a/sampleApp/build.gradle +++ b/sampleApp/build.gradle @@ -4,13 +4,13 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'realm-android' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.zeyad.usecase.accesslayer" minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" multiDexEnabled true diff --git a/usecases/build.gradle b/usecases/build.gradle index c6a2756..40c4bf9 100644 --- a/usecases/build.gradle +++ b/usecases/build.gradle @@ -6,11 +6,11 @@ apply plugin: 'realm-android' apply plugin: "net.ltgt.errorprone" android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.3" defaultConfig { minSdkVersion 17 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "com.zeyad.usecases.integration.AndroidRobolectricRunner" @@ -84,7 +84,7 @@ dependencies { // Rx api 'io.reactivex.rxjava2:rxandroid:2.1.0' - api 'io.reactivex.rxjava2:rxjava:2.2.0' + api 'io.reactivex.rxjava2:rxjava:2.2.3' implementation 'com.jakewharton.rx2:replaying-share-kotlin:2.0.1' // Cache diff --git a/usecases/src/test/java/com/zeyad/usecases/api/DataServiceFactoryTest.kt b/usecases/src/test/java/com/zeyad/usecases/api/DataServiceFactoryTest.kt index 362c83a..c1cc8e4 100644 --- a/usecases/src/test/java/com/zeyad/usecases/api/DataServiceFactoryTest.kt +++ b/usecases/src/test/java/com/zeyad/usecases/api/DataServiceFactoryTest.kt @@ -51,7 +51,8 @@ class DataServiceFactoryTest { @Test @Throws(Exception::class) fun init() { - val instance = DataServiceFactory(mDataServiceConfig).instance + DataServiceFactory(mDataServiceConfig) + val instance = DataServiceFactory.dataService assertNotNull(com.zeyad.usecases.Config.apiConnection) assertNotNull(com.zeyad.usecases.Config.backgroundThread) assertNotNull(com.zeyad.usecases.Config.gson) diff --git a/usecases/src/test/java/com/zeyad/usecases/integration/APIIntegrationTest.java b/usecases/src/test/java/com/zeyad/usecases/integration/APIIntegrationTest.java index 3921f38..ce08ba7 100644 --- a/usecases/src/test/java/com/zeyad/usecases/integration/APIIntegrationTest.java +++ b/usecases/src/test/java/com/zeyad/usecases/integration/APIIntegrationTest.java @@ -48,12 +48,12 @@ public class APIIntegrationTest { @Before public void setUp() { RESTMockServer.reset(); - dataService = new DataServiceFactory(new DataServiceConfig.Builder(RuntimeEnvironment.application) + new DataServiceFactory(new DataServiceConfig.Builder(RuntimeEnvironment.application) .baseUrl(RESTMockServer.getUrl()) // .withRealm() Todo Fix // .withCache(3, TimeUnit.MINUTES) - .build()) - .getInstance(); + .build()); + dataService = DataServiceFactory.Companion.getDataService(); users = new ArrayList<>(2); testUser = new User(); testUser.setAvatarUrl("https://avatars2.githubusercontent.com/u/5938141?v=3");