Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/0.0.5 #4

Merged
merged 5 commits into from
Feb 29, 2024
Merged

Release/0.0.5 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
597bf27
Make dokkaJavaDoc depend on halley core compileKotlin task
kristinakoneva Feb 28, 2024
789251b
Minor adjustments for the release
kristinakoneva Feb 28, 2024
dd5500a
Update changelog
kristinakoneva Feb 28, 2024
0182eaa
Remove unused import
kristinakoneva Feb 28, 2024
f01e3d1
Update the CI workflow
kristinakoneva Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Changelog

## Version 0.0.5

_TBD_
_2024-02-27_

* Tag options per Retrofit service interface method.

Expand Down
1 change: 1 addition & 0 deletions dokka.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"))

Expand Down
8 changes: 4 additions & 4 deletions halley-ktor/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
]
}
}
Expand 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
}
Expand Down
4 changes: 2 additions & 2 deletions halley-retrofit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
1 change: 0 additions & 1 deletion halley-retrofit/src/main/kotlin/com/infinum/halley/retrofit/cache/HalleyOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath libs.tools.gradle
classpath libs.library.plugin
// classpath libs.library.plugin
}
}

Expand All @@ -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
Expand Down
Loading