Merge pull request #58 from infinum/bump_version_1.0.0

Update dependencies and version of the library
infinum · Jan 12, 2024 · 75b60ab · 75b60ab
2 parents 94d193f + 574ba34
commit 75b60ab
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 26 deletions.
diff --git a/annotations/build.gradle b/annotations/build.gradle
@@ -43,4 +43,11 @@ compileTestKotlin {
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.named('dokkaJavadoc') {
+    dependsOn ':core:compileKotlin',
+            ':annotations:compileKotlin',
+            ':retrofit:compileKotlin',
+            ':processor:kaptKotlin'
 }
diff --git a/config.gradle b/config.gradle
@@ -7,7 +7,7 @@ ext {
     ]
     releaseConfig = [
             "group"      : "com.infinum.jsonapix",
-            "version"    : "1.0.0-beta02",
-            "versionCode": 0 * 10000 + 0 * 100 + 3
+            "version"    : "1.0.0",
+            "versionCode": 0 * 10000 + 0 * 100 + 5
     ]
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -49,4 +49,11 @@ compileTestKotlin {
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.named('dokkaJavadoc') {
+    dependsOn ':core:compileKotlin',
+            ':annotations:compileKotlin',
+            ':retrofit:compileKotlin',
+            ':processor:kaptKotlin'
 }
diff --git a/core/src/main/java/com/infinum/jsonapix/core/JsonApiX.kt b/core/src/main/java/com/infinum/jsonapix/core/JsonApiX.kt
@@ -5,7 +5,6 @@ import com.infinum.jsonapix.core.resources.Links
 import com.infinum.jsonapix.core.resources.Meta
 import com.infinum.jsonapix.core.resources.ResourceObject
 
-
 /**
  * The `JsonApiX` interface represents a generic JSON API response.
  * It is designed to encapsulate the main components of a JSON API response,

diff --git a/core/src/main/java/com/infinum/jsonapix/core/discriminators/CommonDiscriminator.kt b/core/src/main/java/com/infinum/jsonapix/core/discriminators/CommonDiscriminator.kt
@@ -103,6 +103,4 @@ class CommonDiscriminator(private val discriminator: String) : Discriminator {
             }
         }
     }
-
-
 }
diff --git a/core/src/main/java/com/infinum/jsonapix/core/resources/DefaultLinks.kt b/core/src/main/java/com/infinum/jsonapix/core/resources/DefaultLinks.kt
@@ -12,4 +12,4 @@ data class DefaultLinks(
     @SerialName("last") val last: String? = null,
     @SerialName("next") val next: String? = null,
     @SerialName("prev") val prev: String? = null
-) : Links
+) : Links
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,22 +1,22 @@
 ext.versions = [
-    "gradle"       : '8.0.1',
-    "kotlin"       : "1.8.21",
-    "poet"         : '1.12.0',
-    "serialization": '1.5.0',
-    "core_ktx"     : '1.9.0',
+    "gradle"       : '8.2.0',
+    "kotlin"       : "1.9.20",
+    "poet"         : '1.15.3',
+    "serialization": '1.6.2',
+    "core_ktx"     : '1.12.0',
     "appcompat"    : '1.6.1',
-    "detekt"       : "1.22.0",
-        "ktlint"       : "11.3.1",
-        "retrofit"     : "2.9.0",
-        "retromock"    : "1.1.1",
-        "hilt"         : "2.45",
+    "detekt"       : "1.23.4",
+    "ktlint"       : "11.3.1",
+    "retrofit"     : "2.9.0",
+    "retromock"    : "1.1.1",
+    "hilt"         : "2.46",
     "lifecycle"    : "2.6.0",
     "activity"     : "1.6.1",
     "fragment"     : "1.5.5",
     "material"     : "1.8.0",
-    "dokka"        : "1.8.10",
-    "jsonapix"     : "0.0.1",
-    "lint"         : '30.2.0',
+    "dokka"        : "1.9.10",
+    "jsonapix"     : "1.0.0",
+    "lint"         : '31.2.0',
     "junit"        : '5.9.2'
 ]
 

diff --git a/dokka.gradle b/dokka.gradle
@@ -15,7 +15,7 @@ tasks.named("dokkaJavadoc") {
                 remoteUrl.set(uri("https://github.com/infinum/android-jsonapix/"))
                 remoteLineSuffix.set("#L")
             }
-            jdkVersion.set(8)
+            jdkVersion.set(17)
             noStdlibLink.set(false)
             noAndroidSdkLink.set(false)
             noJdkLink.set(false)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Mar 11 13:28:02 CET 2023
+#Tue Dec 05 14:12:24 EET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/lint/build.gradle b/lint/build.gradle
@@ -58,4 +58,11 @@ jar {
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.named('dokkaJavadoc') {
+    dependsOn ':core:compileKotlin',
+            ':annotations:compileKotlin',
+            ':retrofit:compileKotlin',
+            ':processor:kaptKotlin'
 }
diff --git a/maven-publish.gradle b/maven-publish.gradle
@@ -57,6 +57,11 @@ afterEvaluate {
                             name = 'Nikola Gobovic'
                             email = '[email protected]'
                         }
+                        developer {
+                            id = 'thisAAY'
+                            name = 'Ahmed Ali'
+                            email = '[email protected]'
+                        }
                     }
                     scm {
                         connection.set(properties.scm.connection)

diff --git a/processor/build.gradle b/processor/build.gradle
@@ -31,7 +31,9 @@ dependencies {
     implementation packages.kotlin.core
     implementation packages.kotlin.poet
     implementation packages.kotlin.poet_metadata
-    compileOnly project(":annotations")
+    // Using compileOnly cause an error with new version from hilt
+    // TODO: https://app.productive.io/1-infinum/tasks/6780558
+    implementation project(":annotations")
     compileOnly project(":core")
     compileOnly packages.kotlin.serialization_core
     compileOnly packages.retrofit.core
@@ -60,4 +62,11 @@ compileTestKotlin {
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.named('dokkaJavadoc') {
+    dependsOn ':core:compileKotlin',
+            ':annotations:compileKotlin',
+            ':retrofit:compileKotlin',
+            ':processor:kaptKotlin'
 }
diff --git a/processor/src/main/java/com/infinum/jsonapix/processor/extensions/StringExtenstions.kt b/processor/src/main/java/com/infinum/jsonapix/processor/extensions/StringExtenstions.kt
@@ -6,4 +6,4 @@ public fun String.appendIf(appendString: String, predicate: (String) -> Boolean)
     } else {
         this
     }
-}
+}
diff --git a/processor/src/main/java/com/infinum/jsonapix/processor/specs/AttributesSpecBuilder.kt b/processor/src/main/java/com/infinum/jsonapix/processor/specs/AttributesSpecBuilder.kt
@@ -73,6 +73,7 @@ internal object AttributesSpecBuilder {
                 ParameterSpec.builder("originalObject", originalClass).build()
             )
             .addStatement("return %L($constructorString)", generatedName)
+            .returns(ClassName.bestGuess(generatedName))
             .build()
     }
 }
diff --git a/processor/src/main/java/com/infinum/jsonapix/processor/specs/RelationshipsSpecBuilder.kt b/processor/src/main/java/com/infinum/jsonapix/processor/specs/RelationshipsSpecBuilder.kt
@@ -173,6 +173,7 @@ internal object RelationshipsSpecBuilder {
                 ParameterSpec.builder("originalObject", originalClass).build()
             )
             .addStatement("return %L($constructorStringBuilder)", *builderArgs.toTypedArray())
+            .returns(ClassName.bestGuess(generatedName))
             .build()
     }
 

diff --git a/...num/jsonapix/processor/specs/jsonxextensions/funspecbuilders/WrapperListFunSpecBuilder.kt b/...num/jsonapix/processor/specs/jsonxextensions/funspecbuilders/WrapperListFunSpecBuilder.kt
@@ -21,7 +21,6 @@ internal object WrapperListFunSpecBuilder {
             "return %T(data =data?.map { it.${JsonApiConstants.Members.TO_RESOURCE_OBJECT}() }?.filterNotNull().orEmpty()"
         )
 
-
         if (includedListStatement != null) {
             returnStatement.append(", ")
             returnStatement.append("included = $includedListStatement")

diff --git a/retrofit/build.gradle b/retrofit/build.gradle
@@ -48,4 +48,11 @@ compileTestKotlin {
 java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.named('dokkaJavadoc') {
+    dependsOn ':core:compileKotlin',
+            ':annotations:compileKotlin',
+            ':retrofit:compileKotlin',
+            ':processor:kaptKotlin'
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
         }
     }