Merge pull request #402 from wuseal/release_library_3.7.4

wuseal · Aug 13, 2022 · bdce7ef · bdce7ef
2 parents 38ee44e + 2a559d0
commit bdce7ef
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Hi, Welcome! This is a plugin to generate Kotlin `data class` from JSON string,
 We also have a `Java/Kotlin` [library](doc/LIBRARY.md). With this you can generate Kotlin `data class` from JSON string **programmatically**. 
 
 ```groovy
-implementation 'com.sealwu.jsontokotlin:library:3.6.1'
+implementation 'com.sealwu.jsontokotlin:library:3.7.4'
 ```
 
 ### Overview

diff --git a/library/build.gradle b/library/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 
     // Core library
-    compile files('libs/JsonToKotlinClass-3.6.1.jar')
+    compile files('libs/JsonToKotlinClass-3.7.4.jar')
 
     // Gson : Gson
     implementation 'com.google.code.gson:gson:2.8.6'

diff --git a/library/dependencies.gradle b/library/dependencies.gradle
@@ -1,4 +1,4 @@
 ext.versions = [
-        j2k_version: '3.6.1',
+        j2k_version: '3.7.4',
         kotlin_version : '1.3.72'
 ]
diff --git a/library/libs/JsonToKotlinClass-3.6.1.jar b/library/libs/JsonToKotlinClass-3.6.1.jar
diff --git a/library/libs/JsonToKotlinClass-3.7.4.jar b/library/libs/JsonToKotlinClass-3.7.4.jar
diff --git a/library/src/test/kotlin/wu/seal/jsontokotlin/JsonToKotlinBuilderTest.kt b/library/src/test/kotlin/wu/seal/jsontokotlin/JsonToKotlinBuilderTest.kt
@@ -928,10 +928,9 @@ class JsonToKotlinBuilderTest {
 
         val expectedOutput = """
             
-                import kotlinx.android.parcel.Parcelize
+                import kotlinx.parcelize.Parcelize
                 import android.os.Parcelable
                 
-                @SuppressLint("ParcelCreator")
                 @Parcelize
                 data class User(
                     val username: String,
@@ -1029,8 +1028,8 @@ class JsonToKotlinBuilderTest {
             )
             
             data class UserX(
-                val username: String = "john",
-                val company_name: String = "ABC Ltd"
+                val username: String = ""${'"'}john""${'"'},
+                val company_name: String = ""${'"'}ABC Ltd""${'"'}
             )
         """.trimIndent()