Merge pull request #31 from irgaly/v1.1.0_rxjava3

Support RxJava3

Author: k-kagurazaka

build.gradle

@@ -6,15 +6,11 @@ buildscript {
         jcenter()
         mavenCentral()
         maven { url "https://plugins.gradle.org/m2/" }
-        maven { url 'https://maven.fabric.io/public' }
         maven { url "https://jitpack.io" }
     }
     dependencies {
         classpath Depends.GradlePlugin.android
         classpath Depends.GradlePlugin.kotlin
-        classpath Depends.GradlePlugin.ktlint
-        classpath Depends.GradlePlugin.fabric
-        classpath Depends.GradlePlugin.androidMaven
     }
 }
 

buildSrc/src/main/java/dependencies/Depends.kt

@@ -3,11 +3,8 @@ package dependencies
 @Suppress("unused")
 object Depends {
     object GradlePlugin {
-        const val android = "com.android.tools.build:gradle:3.2.1"
+        const val android = "com.android.tools.build:gradle:7.0.0"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Kotlin.version}"
-        const val ktlint = "gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:3.0.0"
-        const val fabric = "io.fabric.tools:gradle:1.25.4"
-        const val androidMaven = "com.github.dcendents:android-maven-gradle-plugin:2.0"
     }
 
     object Test {
@@ -30,8 +27,7 @@ object Depends {
     }
 
     object Kotlin {
-        const val version = "1.3.11"
-        const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$version"
+        const val version = "1.5.21"
     }
 
     object Stetho {
@@ -45,10 +41,10 @@ object Depends {
     }
 
     object Retrofit {
-        private const val version = "2.5.0"
+        private const val version = "2.9.0"
         const val core = "com.squareup.retrofit2:retrofit:$version"
         const val converterMoshi = "com.squareup.retrofit2:converter-moshi:$version"
-        const val adapterRxJava2 = "com.squareup.retrofit2:adapter-rxjava2:$version"
+        const val adapterRxJava3 = "com.squareup.retrofit2:adapter-rxjava3:$version"
     }
 
     object Kotshi {
@@ -58,8 +54,8 @@ object Depends {
     }
 
     object Rx {
-        const val RxJava = "io.reactivex.rxjava2:rxjava:2.2.4"
-        const val RxAndroid = "io.reactivex.rxjava2:rxandroid:2.1.0"
-        const val RxKotlin = "io.reactivex.rxjava2:rxkotlin:2.3.0"
+        const val RxJava = "io.reactivex.rxjava3:rxjava:3.0.13"
+        const val RxAndroid = "io.reactivex.rxjava3:rxandroid:3.0.0"
+        const val RxKotlin = "io.reactivex.rxjava3:rxkotlin:3.0.1"
     }
-}
+}

buildSrc/src/main/java/dependencies/Versions.kt

@@ -1,7 +1,7 @@
 package dependencies
 
 private object Versions {
-    val androidCompileSdkVersion = 28
-    val androidTargetSdkVersion = 28
+    val androidCompileSdkVersion = 30
+    val androidTargetSdkVersion = 30
     val androidMinSdkVersion = 19
-}
+}

example/build.gradle

@@ -4,8 +4,6 @@ import dependencies.Versions
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: "org.jlleitschuh.gradle.ktlint"
-apply plugin: 'io.fabric'
 apply from: "${rootDir.absolutePath}/versions.gradle"
 
 def versionMajor = 1
@@ -22,7 +20,6 @@ android {
         targetSdkVersion Versions.androidTargetSdkVersion
         versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch
         versionName "$versionMajor.$versionMinor.$versionPatch"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
         release {
@@ -61,9 +58,6 @@ android {
 dependencies {
     implementation project(':library')
 
-    //==================== Kotlin ====================
-    implementation Depends.Kotlin.stdlib
-
     //==================== Support Library ====================
     implementation Depends.AndroidX.appCompat
     implementation Depends.AndroidX.design
@@ -72,7 +66,7 @@ dependencies {
     //==================== Network ====================
     implementation Depends.Retrofit.core
     implementation Depends.Retrofit.converterMoshi
-    implementation Depends.Retrofit.adapterRxJava2
+    implementation Depends.Retrofit.adapterRxJava3
 
     //==================== Structure ====================
     implementation Depends.Kotshi.api
@@ -99,10 +93,3 @@ dependencies {
     androidTestImplementation Depends.Test.Espresso.core
     androidTestImplementation Depends.Test.Espresso.intents
 }
-
-ktlint {
-    version = versions.ktlint
-    android = true
-    reporter = "checkstyle"
-    ignoreFailures = true
-}

example/src/main/AndroidManifest.xml

@@ -15,10 +15,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="0a7aa1279a42a1b8dd1e111287030f783b9ee2d2" />
-
         <activity android:name="co.kyash.vtl.example.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -28,4 +24,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>

example/src/main/java/co/kyash/vtl/example/MainActivity.kt

@@ -17,15 +17,14 @@ import co.kyash.vtl.validators.RequiredValidator
 import com.crashlytics.android.Crashlytics
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import com.squareup.moshi.Moshi
-import io.fabric.sdk.android.Fabric
-import io.reactivex.Completable
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.schedulers.Schedulers
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Flowable
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import io.reactivex.rxjava3.schedulers.Schedulers
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
 import retrofit2.converter.moshi.MoshiConverterFactory
 
 
@@ -44,14 +43,13 @@ class MainActivity : AppCompatActivity() {
     private val api = Retrofit.Builder()
         .baseUrl("https://raw.githubusercontent.com")
         .addConverterFactory(MoshiConverterFactory.create(Moshi.Builder().build()))
-        .addCallAdapterFactory(RxJava2CallAdapterFactory.createAsync())
+        .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
         .client(OkHttpClient.Builder().addNetworkInterceptor(StethoInterceptor()).build())
         .build()
         .create(MaterialDesignColorsApi::class.java)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Fabric.with(this, Crashlytics())
 
         binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
 

example/src/main/java/co/kyash/vtl/example/api/MaterialDesignColorsApi.kt

@@ -1,11 +1,11 @@
 package co.kyash.vtl.example.api
 
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Single
 import retrofit2.http.GET
 
 interface MaterialDesignColorsApi {
 
     @GET("/Kyash/validatable-textinput-layout/master/json/colors.json")
     fun all(): Single<List<String>>
 
-}
+}

example/src/main/java/co/kyash/vtl/example/validators/MaterialDesignColorsValidator.kt

@@ -5,8 +5,8 @@ import co.kyash.vtl.VtlValidationFailureException
 import co.kyash.vtl.example.R
 import co.kyash.vtl.example.api.MaterialDesignColorsApi
 import co.kyash.vtl.validators.VtlValidator
-import io.reactivex.Completable
-import io.reactivex.Single
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.core.Single
 
 class MaterialDesignColorsValidator(
         private val api: MaterialDesignColorsApi,
@@ -33,4 +33,4 @@ class MaterialDesignColorsValidator(
         return context.getString(R.string.validation_error_colors)
     }
 
-}
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Fri Apr 06 07:32:45 JST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip