From 597bf27aad7a70c2d59ba16c0b1f0b494e62cd16 Mon Sep 17 00:00:00 2001 From: Kristina Koneva Date: Wed, 28 Feb 2024 09:10:15 +0100 Subject: [PATCH 1/5] Make dokkaJavaDoc depend on halley core compileKotlin task --- dokka.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/dokka.gradle b/dokka.gradle index c29f60c..3af7a9a 100644 --- a/dokka.gradle +++ b/dokka.gradle @@ -1,6 +1,7 @@ apply plugin: "org.jetbrains.dokka" tasks.named("dokkaJavadoc") { + dependsOn(":halley-core:compileKotlin") dependsOn(":halley-plugin:pluginVersion") outputDirectory.set(file("$buildDir/javadoc")) From 789251b9a4b806060b17e06af043f375078ba6cf Mon Sep 17 00:00:00 2001 From: Kristina Koneva Date: Wed, 28 Feb 2024 09:12:59 +0100 Subject: [PATCH 2/5] Minor adjustments for the release --- halley-ktor/build.gradle | 8 ++++---- halley-retrofit/build.gradle | 4 ++-- sample/build.gradle | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/halley-ktor/build.gradle b/halley-ktor/build.gradle index 240b383..d5d1678 100644 --- a/halley-ktor/build.gradle +++ b/halley-ktor/build.gradle @@ -16,8 +16,8 @@ compileKotlin { kotlinOptions { jvmTarget = JavaVersion.VERSION_1_8.toString() freeCompilerArgs += [ - '-opt-in=kotlinx.serialization.ExperimentalSerializationApi', - '-Xjvm-default=all' + '-opt-in=kotlinx.serialization.ExperimentalSerializationApi', + '-Xjvm-default=all' ] } } @@ -32,8 +32,8 @@ dependencies { implementation libs.kotlin.core implementation libs.kotlinx.serialization - api libs.library.core -// api project(":halley-core") + // api libs.library.core + api project(":halley-core") implementation libs.ktor.core implementation libs.okhttp } diff --git a/halley-retrofit/build.gradle b/halley-retrofit/build.gradle index c6ee4b6..c9279d3 100644 --- a/halley-retrofit/build.gradle +++ b/halley-retrofit/build.gradle @@ -29,8 +29,8 @@ dependencies { implementation libs.kotlin.core implementation libs.kotlinx.serialization - api libs.library.core -// api project(":halley-core") + // api libs.library.core + api project(":halley-core") implementation libs.okhttp implementation libs.retrofit } diff --git a/sample/build.gradle b/sample/build.gradle index 05da5fd..3fc9f52 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath libs.tools.gradle - classpath libs.library.plugin + // classpath libs.library.plugin } } @@ -15,7 +15,7 @@ plugins { alias libs.plugins.kotlin.android } -apply plugin: "com.infinum.halley.plugin" +// apply plugin: "com.infinum.halley.plugin" android { compileSdkVersion buildConfig.compileSdk From dd5500a42b455f930548b0769e7947b4d919a6d2 Mon Sep 17 00:00:00 2001 From: Kristina Koneva Date: Wed, 28 Feb 2024 09:50:38 +0100 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32b4cdf..616c7a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ Changelog ## Version 0.0.5 -_TBD_ +_2024-02-27_ * Tag options per Retrofit service interface method. From 0182eaaed70e84e08fefd78f8cf6ea818a9a9da4 Mon Sep 17 00:00:00 2001 From: Kristina Koneva Date: Wed, 28 Feb 2024 21:03:31 +0100 Subject: [PATCH 4/5] Remove unused import --- .../kotlin/com/infinum/halley/retrofit/cache/HalleyOptions.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/halley-retrofit/src/main/kotlin/com/infinum/halley/retrofit/cache/HalleyOptions.kt b/halley-retrofit/src/main/kotlin/com/infinum/halley/retrofit/cache/HalleyOptions.kt index 6435d1b..a4f50b9 100644 --- a/halley-retrofit/src/main/kotlin/com/infinum/halley/retrofit/cache/HalleyOptions.kt +++ b/halley-retrofit/src/main/kotlin/com/infinum/halley/retrofit/cache/HalleyOptions.kt @@ -3,7 +3,6 @@ package com.infinum.halley.retrofit.cache import com.infinum.halley.core.serializers.link.models.templated.params.Arguments import com.infinum.halley.core.typealiases.HalleyKeyedMap import com.infinum.halley.core.typealiases.HalleyMap -import com.infinum.halley.retrofit.converters.options.HalleyOptionsFactory /* HalleyOptions are constructed per call site (Retrofit service interface method) and stored in the cache. From f01e3d186f65ff57ac152db977662e0ac3abb190 Mon Sep 17 00:00:00 2001 From: Kristina Koneva Date: Wed, 28 Feb 2024 23:00:26 +0100 Subject: [PATCH 5/5] Update the CI workflow --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d71a844..ed04486 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -33,7 +33,7 @@ jobs: restore-keys: | gradle-caches-${{ runner.os }}- - name: Lint - run: ./gradlew lintAll + run: ./gradlew lint - name: Stop Gradle run: ./gradlew --stop