replace gson by moshi

Author: Sylflo

README.md

@@ -12,7 +12,7 @@ An MVP Boilerplate to save me having to create the same project over from scratc
 ## This project uses:
 - [RxJava2](https://github.com/ReactiveX/RxJava) and [RxAndroid](https://github.com/ReactiveX/RxAndroid)
 - [Retrofit](http://square.github.io/retrofit/) / [OkHttp](http://square.github.io/okhttp/)
-- [Gson](https://github.com/google/gson)
+- [Moshi](https://github.com/square/moshi)
 - [Dagger 2](http://google.github.io/dagger/)
 - [Butterknife](https://github.com/JakeWharton/butterknife)
 - [Google Play Services](https://developers.google.com/android/guides/overview)

app/dependencies.gradle

@@ -2,6 +2,7 @@ ext {
     versions = [
             support         : "26.0.0",
             firebase        : '11.0.4',
+            moshi           : "1.5.0",
             okHttp          : "3.8.1",
             retrofit        : '2.3.0',
             dagger          : '2.11',
@@ -54,10 +55,14 @@ ext {
     retrofit = [
             retrofit     : "com.squareup.retrofit2:retrofit:$versions.retrofit",
             rxAdapter    : "com.squareup.retrofit2:adapter-rxjava2:$versions.retrofit",
-            gsonConverter: "com.squareup.retrofit2:converter-gson:$versions.retrofit",
+            moshiConverter: "com.squareup.retrofit2:converter-moshi:$versions.retrofit",
             sqlbrite     : "com.squareup.sqlbrite:sqlbrite:$versions.sqlbrite"
     ]
 
+    moshi = [
+            moshi: "com.squareup.moshi:moshi-kotlin:$versions.moshi"
+    ]
+
     okHttp = [
             logger: "com.squareup.okhttp3:logging-interceptor:$versions.okHttp",
             okhttp  : "com.squareup.okhttp3:okhttp:$versions.okHttp",
@@ -120,7 +125,7 @@ ext {
 
     googlePlayLibs = googlePlay.values()
     supportLibs = supportDeps.values()
-    networkLibs = retrofit.values() + okHttp.values()
+    networkLibs = retrofit.values() + okHttp.values() + moshi.values()
     rxJavaLibs = rxJava.values()
     otherLibs = [butterKnife, timber, dagger, glide]
 

app/proguard-rules.pro

@@ -7,13 +7,17 @@
 ####--------Okio----------####
 -dontwarn okio.**
 
-####--------Gson----------####
--keepattributes Signature
--keepattributes *Annotation*
--keep class sun.misc.Unsafe { *; }
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
+####--------Moshi---------####
+-dontwarn okio.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault
+-keepclasseswithmembers class * {
+    @com.squareup.moshi.* <methods>;
+}
+-keep @com.squareup.moshi.JsonQualifier interface *
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
 
 ####-----Model classes---####
 -keep class io.mvpstarter.sample.data.model.** { *; }

app/src/main/java/io/mvpstarter/sample/data/model/Sprites.kt

@@ -1,8 +1,8 @@
 package io.mvpstarter.sample.data.model
 
-import com.google.gson.annotations.SerializedName
+import com.squareup.moshi.Json
 
 class Sprites {
-    @SerializedName("front_default")
+    @Json(name="front_default")
     var frontDefault: String? = null
 }

app/src/main/java/io/mvpstarter/sample/data/model/Statistic.kt

@@ -1,9 +1,9 @@
 package io.mvpstarter.sample.data.model
 
-import com.google.gson.annotations.SerializedName
+import com.squareup.moshi.Json
 
 class Statistic {
     var stat: NamedResource? = null
-    @SerializedName("base_stat")
+    @Json(name="base_stat")
     var baseStat: Int = 0
-}
+}

app/src/main/java/io/mvpstarter/sample/injection/module/NetworkModule.kt

@@ -2,18 +2,17 @@ package io.mvpstarter.sample.injection.module
 
 import android.content.Context
 import com.facebook.stetho.okhttp3.StethoInterceptor
-import com.google.gson.FieldNamingPolicy
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
 import com.readystatesoftware.chuck.ChuckInterceptor
+import com.squareup.moshi.KotlinJsonAdapterFactory
+import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
 import io.mvpstarter.sample.BuildConfig
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
-import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.converter.moshi.MoshiConverterFactory
 import timber.log.Timber
 import javax.inject.Singleton
 
@@ -29,11 +28,11 @@ class NetworkModule(private val context: Context) {
 
     @Provides
     @Singleton
-    internal fun provideRetrofit(okHttpClient: OkHttpClient, gson: Gson): Retrofit {
+    internal fun provideRetrofit(okHttpClient: OkHttpClient, moshi: Moshi): Retrofit {
         return Retrofit.Builder()
                 .baseUrl(getBaseUrl())
                 .client(okHttpClient)
-                .addConverterFactory(GsonConverterFactory.create(gson))
+                .addConverterFactory(MoshiConverterFactory.create(moshi))
                 .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .build()
 
@@ -74,13 +73,15 @@ class NetworkModule(private val context: Context) {
         return StethoInterceptor()
     }
 
+
     @Provides
     @Singleton
-    internal fun provideGson(): Gson {
-        return GsonBuilder()
-                .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-                .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
-                .create()
+    internal fun provideMoshi(): Moshi {
+        return Moshi
+                .Builder()
+                .add(KotlinJsonAdapterFactory())
+                .build()
+
     }
 
 }