Merge pull request #138 from agologan/master

cortinico · web-flow · commit 09d9a4fc7599 · 2020-07-29T19:20:55.000+02:00
diff --git a/README.md b/README.md
@@ -67,8 +67,8 @@ Here the list of the supported platforms:
 
 | Platform | Description                                |
 | -------- | ------------------------------------------ |
-| `kotlin` | Generates Kotlin code and Retrofit interfaces, with RxJava2 for async calls, Moshi for serialization and ThreeTenABP for Data management |
-| `kotlin-coroutines` | Generates Kotlin code and Retrofit interfaces, with [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html) for async calls, Moshi for serialization and ThreeTenABP for Data management |
+| `kotlin` | Generates Kotlin code and Retrofit interfaces, with RxJava2 for async calls and Moshi for serialization |
+| `kotlin-coroutines` | Generates Kotlin code and Retrofit interfaces, with [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html) for async calls and Moshi for serialization |
 
 We're looking forward to more platforms to support in the future. Contributions are more than welcome.
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -55,7 +55,7 @@ val preMerge = tasks.register("preMerge") {
 }
 
 plugins {
-    id("com.android.library").version("3.5.3").apply(false)
+    id("com.android.library").version("4.0.1").apply(false)
     id("com.yelp.codegen.plugin").version("1.4.1").apply(false)
     id("io.gitlab.arturbosch.detekt").version("1.9.0").apply(false)
     kotlin("android").version("1.3.70").apply(false)
diff --git a/gradle-plugin/plugin/src/main/java/com/yelp/codegen/utils/KotlinLangUtils.kt b/gradle-plugin/plugin/src/main/java/com/yelp/codegen/utils/KotlinLangUtils.kt
@@ -138,8 +138,8 @@ object KotlinLangUtils {
         "Long" to "kotlin.Long",
         "Double" to "kotlin.Double",
         "BigDecimal" to "java.math.BigDecimal",
-        "LocalDate" to "org.threeten.bp.LocalDate",
-        "ZonedDateTime" to "org.threeten.bp.ZonedDateTime",
+        "LocalDate" to "java.time.LocalDate",
+        "ZonedDateTime" to "java.time.ZonedDateTime",
         "File" to "java.io.File",
         "List" to "kotlin.collections.List",
         "List<Byte>" to "kotlin.collections.List",
diff --git a/gradle-plugin/plugin/src/main/resources/kotlin/tools/TypesAdapters.kt.mustache b/gradle-plugin/plugin/src/main/resources/kotlin/tools/TypesAdapters.kt.mustache
@@ -7,12 +7,12 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.internal.Util
 import java.lang.reflect.Type
 import java.math.BigDecimal
-import org.threeten.bp.DateTimeException
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.ZoneId
-import org.threeten.bp.ZonedDateTime
-import org.threeten.bp.format.DateTimeFormatter
+import java.time.DateTimeException
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
 
 /**
  * Moshi Factory to handle all the custom types we want to support,
diff --git a/gradle-plugin/plugin/src/test/java/com/yelp/codegen/KotlinGeneratorTest.kt b/gradle-plugin/plugin/src/test/java/com/yelp/codegen/KotlinGeneratorTest.kt
@@ -244,8 +244,8 @@ class KotlinGeneratorTest {
     @Test
     fun toModelName_withImportMapping() {
         val generator = KotlinGenerator()
-        generator.importMapping()["threeten"] = "org.threeten.bp.LocalDate"
-        assertEquals("threeten", generator.toModelName("threeten"))
+        generator.importMapping()["Instant"] = "java.time.Instant"
+        assertEquals("Instant", generator.toModelName("Instant"))
     }
 
     @Test
diff --git a/samples/groovy-android/build.gradle b/samples/groovy-android/build.gradle
@@ -13,6 +13,11 @@ android {
         versionCode = 1
         versionName = "1.0"
     }
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -28,8 +33,8 @@ dependencies {
     implementation "com.squareup.retrofit2:adapter-rxjava2:2.7.1"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
 
-    // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
+    // Date Support via Desugaring
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
 
     // RxJava
     implementation "io.reactivex.rxjava2:rxjava:2.2.17"
diff --git a/samples/junit-tests/build.gradle b/samples/junit-tests/build.gradle
@@ -18,9 +18,6 @@ dependencies {
     implementation "com.squareup.retrofit2:adapter-rxjava2:2.7.1"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
 
-    // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
-
     // RxJava
     implementation "io.reactivex.rxjava2:rxjava:2.2.17"
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
diff --git a/samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/models/FormatResponses.kt b/samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/models/FormatResponses.kt
@@ -8,8 +8,8 @@ package com.yelp.codegen.generatecodesamples.models
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import org.threeten.bp.LocalDate
-import org.threeten.bp.ZonedDateTime
+import java.time.LocalDate
+import java.time.ZonedDateTime
 
 /**
  * @property dateProperty
diff --git a/samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/models/XnullableFormatResponses.kt b/samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/models/XnullableFormatResponses.kt
@@ -9,8 +9,8 @@ package com.yelp.codegen.generatecodesamples.models
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.yelp.codegen.generatecodesamples.tools.XNullable
-import org.threeten.bp.LocalDate
-import org.threeten.bp.ZonedDateTime
+import java.time.LocalDate
+import java.time.ZonedDateTime
 
 /**
  * @property dateProperty
diff --git a/samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/tools/TypesAdapters.kt b/samples/junit-tests/src/main/java/com/yelp/codegen/generatecodesamples/tools/TypesAdapters.kt
@@ -5,14 +5,14 @@ import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.internal.Util
-import org.threeten.bp.DateTimeException
-import org.threeten.bp.LocalDate
-import org.threeten.bp.LocalDateTime
-import org.threeten.bp.ZoneId
-import org.threeten.bp.ZonedDateTime
-import org.threeten.bp.format.DateTimeFormatter
 import java.lang.reflect.Type
 import java.math.BigDecimal
+import java.time.DateTimeException
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
 
 /**
  * Moshi Factory to handle all the custom types we want to support,
diff --git a/samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/FormatEndpointTest.kt b/samples/junit-tests/src/test/java/com/yelp/codegen/generatecodesamples/FormatEndpointTest.kt
@@ -7,9 +7,9 @@ import okhttp3.mockwebserver.MockResponse
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
-import org.threeten.bp.LocalDate
-import org.threeten.bp.ZoneId
-import org.threeten.bp.ZonedDateTime
+import java.time.LocalDate
+import java.time.ZoneId
+import java.time.ZonedDateTime
 
 class FormatEndpointTest {
 
diff --git a/samples/kotlin-android/build.gradle.kts b/samples/kotlin-android/build.gradle.kts
@@ -12,6 +12,11 @@ android {
         versionCode = 1
         versionName = "1.0"
     }
+    compileOptions {
+        coreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -26,8 +31,8 @@ dependencies {
     implementation("com.squareup.retrofit2:converter-moshi:2.7.1")
     implementation("com.squareup.retrofit2:adapter-rxjava2:2.7.1")
 
-    // Date Support
-    implementation("com.jakewharton.threetenabp:threetenabp:1.2.2")
+    // Date Support via Desugaring
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.9")
 
     // RxJava
     implementation("io.reactivex.rxjava2:rxjava:2.2.17")
diff --git a/samples/kotlin-coroutines/build.gradle b/samples/kotlin-coroutines/build.gradle
@@ -13,6 +13,11 @@ android {
         versionCode = 1
         versionName = "1.0"
     }
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -27,8 +32,8 @@ dependencies {
     implementation "com.squareup.retrofit2:converter-moshi:2.7.1"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
 
-    // Date Support
-    implementation "com.jakewharton.threetenabp:threetenabp:1.2.2"
+    // Date Support via Desugaring
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.0.9"
 
     // Testing Dependencies
     testImplementation "junit:junit:4.12"

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ val preMerge = tasks.register("preMerge") {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`plugins {`
`58`		`- id("com.android.library").version("3.5.3").apply(false)`
	`58`	`+ id("com.android.library").version("4.0.1").apply(false)`
`59`	`59`	`id("com.yelp.codegen.plugin").version("1.4.1").apply(false)`
`60`	`60`	`id("io.gitlab.arturbosch.detekt").version("1.9.0").apply(false)`
`61`	`61`	`kotlin("android").version("1.3.70").apply(false)`