Skip to content

Add deps as api and fix package structurte #12

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

Merged
merged 1 commit into from
Apr 23, 2022
Merged

Add deps as api and fix package structurte #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ repositories {
}

dependencies {
implementation(platform("io.ktor:ktor-bom:2.0.0"))
api(platform("io.ktor:ktor-bom:2.0.0"))

implementation("io.ktor:ktor-client-core")
implementation("io.ktor:ktor-client-cio")
implementation("io.ktor:ktor-client-content-negotiation")
implementation("io.ktor:ktor-serialization-kotlinx-json")
implementation("io.ktor:ktor-client-logging")
api("io.ktor:ktor-client-core")
api("io.ktor:ktor-client-cio")
api("io.ktor:ktor-client-content-negotiation")
api("io.ktor:ktor-serialization-kotlinx-json")
api("io.ktor:ktor-client-logging")

implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2")
implementation("ch.qos.logback:logback-classic:1.2.11")
api("org.jetbrains.kotlinx:kotlinx-datetime:0.3.2")
api("ch.qos.logback:logback-classic:1.2.11")

testImplementation(kotlin("test"))
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1")
Expand Down
3 changes: 1 addition & 2 deletions ...lin/sh/nemo/meilisearch/apis/Documents.kt → ...n/kotlin/sh/nemo/meilisearch/Documents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sh.nemo.meilisearch.apis
package sh.nemo.meilisearch

import io.ktor.client.call.body
import io.ktor.client.request.delete
Expand All @@ -7,7 +7,6 @@ import io.ktor.client.request.parameter
import io.ktor.client.request.post
import io.ktor.client.request.put
import io.ktor.client.request.setBody
import sh.nemo.meilisearch.Meilisearch
import sh.nemo.meilisearch.responses.ChangeResponse

suspend inline fun <reified T> Meilisearch.getDocuments(
Expand Down
3 changes: 1 addition & 2 deletions ...kotlin/sh/nemo/meilisearch/apis/Health.kt → ...main/kotlin/sh/nemo/meilisearch/Health.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package sh.nemo.meilisearch.apis
package sh.nemo.meilisearch

import io.ktor.client.call.body
import io.ktor.client.request.get
import sh.nemo.meilisearch.Meilisearch
import sh.nemo.meilisearch.responses.HealthResponse

suspend fun Meilisearch.health(): HealthResponse = this.client.get("/health").body()
3 changes: 1 addition & 2 deletions ...otlin/sh/nemo/meilisearch/apis/Indexes.kt → ...ain/kotlin/sh/nemo/meilisearch/Indexes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package sh.nemo.meilisearch.apis
package sh.nemo.meilisearch

import io.ktor.client.call.body
import io.ktor.client.request.delete
import io.ktor.client.request.get
import io.ktor.client.request.post
import io.ktor.client.request.put
import io.ktor.client.request.setBody
import sh.nemo.meilisearch.Meilisearch
import sh.nemo.meilisearch.requests.IndexCreateRequest
import sh.nemo.meilisearch.requests.IndexUpdateRequest
import sh.nemo.meilisearch.responses.ChangeResponse
Expand Down
3 changes: 1 addition & 2 deletions ...n/kotlin/sh/nemo/meilisearch/apis/Keys.kt → src/main/kotlin/sh/nemo/meilisearch/Keys.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package sh.nemo.meilisearch.apis
package sh.nemo.meilisearch

import io.ktor.client.call.body
import io.ktor.client.request.delete
Expand All @@ -7,7 +7,6 @@ import io.ktor.client.request.patch
import io.ktor.client.request.post
import io.ktor.client.request.setBody
import kotlinx.datetime.Instant
import sh.nemo.meilisearch.Meilisearch
import sh.nemo.meilisearch.requests.KeyUpsertRequest
import sh.nemo.meilisearch.responses.KeyResponse
import sh.nemo.meilisearch.responses.KeysResponse
Expand Down
3 changes: 1 addition & 2 deletions ...kotlin/sh/nemo/meilisearch/apis/Search.kt → ...main/kotlin/sh/nemo/meilisearch/Search.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package sh.nemo.meilisearch.apis
package sh.nemo.meilisearch

import io.ktor.client.call.body
import io.ktor.client.request.post
import io.ktor.client.request.setBody
import sh.nemo.meilisearch.Meilisearch
import sh.nemo.meilisearch.requests.SearchRequest
import sh.nemo.meilisearch.responses.SearchResponse

Expand Down
3 changes: 1 addition & 2 deletions .../kotlin/sh/nemo/meilisearch/apis/Tasks.kt → src/main/kotlin/sh/nemo/meilisearch/Tasks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package sh.nemo.meilisearch.apis
package sh.nemo.meilisearch

import io.ktor.client.call.body
import io.ktor.client.request.get
import kotlinx.datetime.Clock
import kotlinx.datetime.Instant
import sh.nemo.meilisearch.Meilisearch
import sh.nemo.meilisearch.responses.TaskResponse

suspend fun Meilisearch.listTasks(): List<TaskResponse> = this.client.get("/tasks").body()
Expand Down
8 changes: 0 additions & 8 deletions src/test/kotlin/sh/nemo/meilisearch/DocumentsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
import kotlinx.serialization.Serializable
import org.junit.jupiter.api.Test
import sh.nemo.meilisearch.apis.addDocuments
import sh.nemo.meilisearch.apis.createIndex
import sh.nemo.meilisearch.apis.deleteAllDocuments
import sh.nemo.meilisearch.apis.deleteDocument
import sh.nemo.meilisearch.apis.getDocument
import sh.nemo.meilisearch.apis.getDocuments
import sh.nemo.meilisearch.apis.updateDocuments
import sh.nemo.meilisearch.apis.waitForTask
import kotlin.test.assertEquals
import kotlin.test.assertTrue

Expand Down
1 change: 0 additions & 1 deletion src/test/kotlin/sh/nemo/meilisearch/HealthTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package sh.nemo.meilisearch
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Test
import sh.nemo.meilisearch.apis.health
import kotlin.test.assertEquals

@OptIn(ExperimentalCoroutinesApi::class)
Expand Down
6 changes: 0 additions & 6 deletions src/test/kotlin/sh/nemo/meilisearch/IndexesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@ import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Assertions.assertThrows
import org.junit.jupiter.api.Test
import sh.nemo.meilisearch.apis.createIndex
import sh.nemo.meilisearch.apis.deleteIndex
import sh.nemo.meilisearch.apis.getIndex
import sh.nemo.meilisearch.apis.listIndexes
import sh.nemo.meilisearch.apis.updateIndexPrimaryKey
import sh.nemo.meilisearch.apis.waitForTask
import sh.nemo.meilisearch.exceptions.ResourceNotFound
import kotlin.test.assertEquals
import kotlin.test.assertTrue
Expand Down
5 changes: 0 additions & 5 deletions src/test/kotlin/sh/nemo/meilisearch/KeysTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ import kotlinx.datetime.TimeZone
import kotlinx.datetime.plus
import org.junit.jupiter.api.Assertions.assertThrows
import org.junit.jupiter.api.Test
import sh.nemo.meilisearch.apis.createKey
import sh.nemo.meilisearch.apis.deleteKey
import sh.nemo.meilisearch.apis.getKey
import sh.nemo.meilisearch.apis.listKeys
import sh.nemo.meilisearch.apis.updateKey
import sh.nemo.meilisearch.exceptions.ResourceNotFound
import kotlin.test.assertEquals
import kotlin.test.assertTrue
Expand Down
4 changes: 0 additions & 4 deletions src/test/kotlin/sh/nemo/meilisearch/SearchTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
import kotlinx.serialization.Serializable
import org.junit.jupiter.api.Test
import sh.nemo.meilisearch.apis.addDocuments
import sh.nemo.meilisearch.apis.createIndex
import sh.nemo.meilisearch.apis.search
import sh.nemo.meilisearch.apis.waitForTask
import kotlin.test.assertEquals

@OptIn(ExperimentalCoroutinesApi::class)
Expand Down