Skip to content

Commit a28cd69

Browse files
martinbonninmartinbonnin
authored
Merge pull request #4 from apollographql/apollo4
Update to Apollo Kotlin 4.0.0-rc.1
2 parents d0740dc + 252f905 commit a28cd69

File tree

13 files changed

+52
-51
lines changed

13 files changed

+52
-51
lines changed

‎.github/workflows/publish-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
1515
- run: |
16-
./gradlew librarianReleaseStagingRepo
16+
./gradlew librarianPublishToMavenCentral
1717
gh release create $GITHUB_REF_NAME --title $GITHUB_REF_NAME --verify-tag --notes-from-tag
1818
env:
1919
LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.LIBRARIAN_SONATYPE_USERNAME }}

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Next version (unreleased)
22

3-
PUT_CHANGELOG_HERE
3+
Update to Apollo Kotlin 4.0.0-rc.1
44

55
# Version 0.0.1
66
_2024-06-21_

‎apollo-engine-ktor/api/apollo-engine-ktor.api‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
public final class com/apollographql/ktor/KtorExtensionsKt {
2-
public static final fun ktorClient (Lcom/apollographql/apollo3/ApolloClient$Builder;Lio/ktor/client/HttpClient;)Lcom/apollographql/apollo3/ApolloClient$Builder;
2+
public static final fun ktorClient (Lcom/apollographql/apollo/ApolloClient$Builder;Lio/ktor/client/HttpClient;)Lcom/apollographql/apollo/ApolloClient$Builder;
33
}
44

5-
public final class com/apollographql/ktor/adapter/KtorHttpUrlAdapter : com/apollographql/apollo3/api/Adapter {
5+
public final class com/apollographql/ktor/adapter/KtorHttpUrlAdapter : com/apollographql/apollo/api/Adapter {
66
public static final field INSTANCE Lcom/apollographql/ktor/adapter/KtorHttpUrlAdapter;
7-
public fun fromJson (Lcom/apollographql/apollo3/api/json/JsonReader;Lcom/apollographql/apollo3/api/CustomScalarAdapters;)Lio/ktor/http/Url;
8-
public synthetic fun fromJson (Lcom/apollographql/apollo3/api/json/JsonReader;Lcom/apollographql/apollo3/api/CustomScalarAdapters;)Ljava/lang/Object;
9-
public fun toJson (Lcom/apollographql/apollo3/api/json/JsonWriter;Lcom/apollographql/apollo3/api/CustomScalarAdapters;Lio/ktor/http/Url;)V
10-
public synthetic fun toJson (Lcom/apollographql/apollo3/api/json/JsonWriter;Lcom/apollographql/apollo3/api/CustomScalarAdapters;Ljava/lang/Object;)V
7+
public fun fromJson (Lcom/apollographql/apollo/api/json/JsonReader;Lcom/apollographql/apollo/api/CustomScalarAdapters;)Lio/ktor/http/Url;
8+
public synthetic fun fromJson (Lcom/apollographql/apollo/api/json/JsonReader;Lcom/apollographql/apollo/api/CustomScalarAdapters;)Ljava/lang/Object;
9+
public fun toJson (Lcom/apollographql/apollo/api/json/JsonWriter;Lcom/apollographql/apollo/api/CustomScalarAdapters;Lio/ktor/http/Url;)V
10+
public synthetic fun toJson (Lcom/apollographql/apollo/api/json/JsonWriter;Lcom/apollographql/apollo/api/CustomScalarAdapters;Ljava/lang/Object;)V
1111
}
1212

13-
public final class com/apollographql/ktor/http/KtorHttpEngine : com/apollographql/apollo3/network/http/HttpEngine {
13+
public final class com/apollographql/ktor/http/KtorHttpEngine : com/apollographql/apollo/network/http/HttpEngine {
1414
public fun <init> (J)V
1515
public synthetic fun <init> (JILkotlin/jvm/internal/DefaultConstructorMarker;)V
1616
public fun <init> (JJ)V
1717
public fun <init> (Lio/ktor/client/HttpClient;)V
1818
public fun close ()V
19-
public fun execute (Lcom/apollographql/apollo3/api/http/HttpRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
19+
public fun execute (Lcom/apollographql/apollo/api/http/HttpRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
2020
}
2121

22-
public final class com/apollographql/ktor/ws/KtorWebSocketEngine : com/apollographql/apollo3/network/ws/WebSocketEngine {
22+
public final class com/apollographql/ktor/ws/KtorWebSocketEngine : com/apollographql/apollo/network/ws/WebSocketEngine {
2323
public fun <init> ()V
2424
public fun <init> (Lio/ktor/client/HttpClient;)V
2525
public fun open (Ljava/lang/String;Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

‎apollo-engine-ktor/api/apollo-engine-ktor.klib.api‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
// - Show declarations: true
77

88
// Library unique name: <com.apollographql.ktor:apollo-engine-ktor>
9-
final class com.apollographql.ktor.http/KtorHttpEngine : com.apollographql.apollo3.network.http/HttpEngine { // com.apollographql.ktor.http/KtorHttpEngine|null[0]
9+
final class com.apollographql.ktor.http/KtorHttpEngine : com.apollographql.apollo.network.http/HttpEngine { // com.apollographql.ktor.http/KtorHttpEngine|null[0]
1010
constructor <init>(io.ktor.client/HttpClient) // com.apollographql.ktor.http/KtorHttpEngine.<init>|<init>(io.ktor.client.HttpClient){}[0]
1111
constructor <init>(kotlin/Long = ...) // com.apollographql.ktor.http/KtorHttpEngine.<init>|<init>(kotlin.Long){}[0]
1212
constructor <init>(kotlin/Long, kotlin/Long) // com.apollographql.ktor.http/KtorHttpEngine.<init>|<init>(kotlin.Long;kotlin.Long){}[0]
1313
final fun close() // com.apollographql.ktor.http/KtorHttpEngine.close|close(){}[0]
14-
final suspend fun execute(com.apollographql.apollo3.api.http/HttpRequest): com.apollographql.apollo3.api.http/HttpResponse // com.apollographql.ktor.http/KtorHttpEngine.execute|execute(com.apollographql.apollo3.api.http.HttpRequest){}[0]
14+
final suspend fun execute(com.apollographql.apollo.api.http/HttpRequest): com.apollographql.apollo.api.http/HttpResponse // com.apollographql.ktor.http/KtorHttpEngine.execute|execute(com.apollographql.apollo.api.http.HttpRequest){}[0]
1515
}
16-
final class com.apollographql.ktor.ws/KtorWebSocketEngine : com.apollographql.apollo3.network.ws/WebSocketEngine { // com.apollographql.ktor.ws/KtorWebSocketEngine|null[0]
16+
final class com.apollographql.ktor.ws/KtorWebSocketEngine : com.apollographql.apollo.network.ws/WebSocketEngine { // com.apollographql.ktor.ws/KtorWebSocketEngine|null[0]
1717
constructor <init>() // com.apollographql.ktor.ws/KtorWebSocketEngine.<init>|<init>(){}[0]
1818
constructor <init>(io.ktor.client/HttpClient) // com.apollographql.ktor.ws/KtorWebSocketEngine.<init>|<init>(io.ktor.client.HttpClient){}[0]
19-
final suspend fun open(kotlin/String, kotlin.collections/List<com.apollographql.apollo3.api.http/HttpHeader>): com.apollographql.apollo3.network.ws/WebSocketConnection // com.apollographql.ktor.ws/KtorWebSocketEngine.open|open(kotlin.String;kotlin.collections.List<com.apollographql.apollo3.api.http.HttpHeader>){}[0]
19+
final suspend fun open(kotlin/String, kotlin.collections/List<com.apollographql.apollo.api.http/HttpHeader>): com.apollographql.apollo.network.ws/WebSocketConnection // com.apollographql.ktor.ws/KtorWebSocketEngine.open|open(kotlin.String;kotlin.collections.List<com.apollographql.apollo.api.http.HttpHeader>){}[0]
2020
}
21-
final fun (com.apollographql.apollo3/ApolloClient.Builder).com.apollographql.ktor/ktorClient(io.ktor.client/HttpClient): com.apollographql.apollo3/ApolloClient.Builder // com.apollographql.ktor/ktorClient|[email protected].apollo3.ApolloClient.Builder(io.ktor.client.HttpClient){}[0]
22-
final object com.apollographql.ktor.adapter/KtorHttpUrlAdapter : com.apollographql.apollo3.api/Adapter<io.ktor.http/Url> { // com.apollographql.ktor.adapter/KtorHttpUrlAdapter|null[0]
23-
final fun fromJson(com.apollographql.apollo3.api.json/JsonReader, com.apollographql.apollo3.api/CustomScalarAdapters): io.ktor.http/Url // com.apollographql.ktor.adapter/KtorHttpUrlAdapter.fromJson|fromJson(com.apollographql.apollo3.api.json.JsonReader;com.apollographql.apollo3.api.CustomScalarAdapters){}[0]
24-
final fun toJson(com.apollographql.apollo3.api.json/JsonWriter, com.apollographql.apollo3.api/CustomScalarAdapters, io.ktor.http/Url) // com.apollographql.ktor.adapter/KtorHttpUrlAdapter.toJson|toJson(com.apollographql.apollo3.api.json.JsonWriter;com.apollographql.apollo3.api.CustomScalarAdapters;io.ktor.http.Url){}[0]
21+
final fun (com.apollographql.apollo/ApolloClient.Builder).com.apollographql.ktor/ktorClient(io.ktor.client/HttpClient): com.apollographql.apollo/ApolloClient.Builder // com.apollographql.ktor/ktorClient|[email protected].apollo.ApolloClient.Builder(io.ktor.client.HttpClient){}[0]
22+
final object com.apollographql.ktor.adapter/KtorHttpUrlAdapter : com.apollographql.apollo.api/Adapter<io.ktor.http/Url> { // com.apollographql.ktor.adapter/KtorHttpUrlAdapter|null[0]
23+
final fun fromJson(com.apollographql.apollo.api.json/JsonReader, com.apollographql.apollo.api/CustomScalarAdapters): io.ktor.http/Url // com.apollographql.ktor.adapter/KtorHttpUrlAdapter.fromJson|fromJson(com.apollographql.apollo.api.json.JsonReader;com.apollographql.apollo.api.CustomScalarAdapters){}[0]
24+
final fun toJson(com.apollographql.apollo.api.json/JsonWriter, com.apollographql.apollo.api/CustomScalarAdapters, io.ktor.http/Url) // com.apollographql.ktor.adapter/KtorHttpUrlAdapter.toJson|toJson(com.apollographql.apollo.api.json.JsonWriter;com.apollographql.apollo.api.CustomScalarAdapters;io.ktor.http.Url){}[0]
2525
}

‎apollo-engine-ktor/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import com.gradleup.librarian.core.librarianModule
1+
import com.gradleup.librarian.gradle.librarianModule
22
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
33

44
plugins {
55
id("org.jetbrains.kotlin.multiplatform")
66
}
77

8-
librarianModule()
8+
librarianModule(true)
99

1010
kotlin {
1111
jvm()
@@ -48,7 +48,7 @@ kotlin {
4848
}
4949
findByName("commonTest")?.apply {
5050
dependencies {
51-
//implementation(libs.apollo.engine.tests)
51+
implementation(libs.apollo.engine.tests)
5252
implementation(libs.kotlin.test)
5353
implementation(libs.kotlinx.coroutines.test)
5454
implementation(libs.kotlinx.coroutines.core)

‎apollo-engine-ktor/src/commonMain/kotlin/com/apollographql/ktor/KtorExtensions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.apollographql.ktor
22

3-
import com.apollographql.apollo3.ApolloClient
3+
import com.apollographql.apollo.ApolloClient
44
import com.apollographql.ktor.http.KtorHttpEngine
55
import com.apollographql.ktor.ws.KtorWebSocketEngine
66
import io.ktor.client.*

‎apollo-engine-ktor/src/commonMain/kotlin/com/apollographql/ktor/adapter/KtorHttpUrlAdapter.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.apollographql.ktor.adapter
22

3-
import com.apollographql.apollo3.api.Adapter
4-
import com.apollographql.apollo3.api.CustomScalarAdapters
5-
import com.apollographql.apollo3.api.json.JsonReader
6-
import com.apollographql.apollo3.api.json.JsonWriter
3+
import com.apollographql.apollo.api.Adapter
4+
import com.apollographql.apollo.api.CustomScalarAdapters
5+
import com.apollographql.apollo.api.json.JsonReader
6+
import com.apollographql.apollo.api.json.JsonWriter
77
import io.ktor.http.Url
88

99
/**

‎apollo-engine-ktor/src/commonMain/kotlin/com/apollographql/ktor/http/KtorHttpEngine.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.apollographql.ktor.http
22

3-
import com.apollographql.apollo3.api.http.HttpHeader
4-
import com.apollographql.apollo3.api.http.HttpMethod
5-
import com.apollographql.apollo3.api.http.HttpRequest
6-
import com.apollographql.apollo3.api.http.HttpResponse
7-
import com.apollographql.apollo3.exception.ApolloNetworkException
8-
import com.apollographql.apollo3.network.http.HttpEngine
3+
import com.apollographql.apollo.api.http.HttpHeader
4+
import com.apollographql.apollo.api.http.HttpMethod
5+
import com.apollographql.apollo.api.http.HttpRequest
6+
import com.apollographql.apollo.api.http.HttpResponse
7+
import com.apollographql.apollo.exception.ApolloNetworkException
8+
import com.apollographql.apollo.network.http.HttpEngine
99
import io.ktor.client.*
1010
import io.ktor.client.call.*
1111
import io.ktor.client.plugins.*

‎apollo-engine-ktor/src/commonMain/kotlin/com/apollographql/ktor/ws/KtorWebSocketEngine.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.apollographql.ktor.ws
22

3-
import com.apollographql.apollo3.api.http.HttpHeader
4-
import com.apollographql.apollo3.exception.ApolloNetworkException
5-
import com.apollographql.apollo3.exception.ApolloWebSocketClosedException
6-
import com.apollographql.apollo3.network.ws.CLOSE_NORMAL
7-
import com.apollographql.apollo3.network.ws.WebSocketConnection
8-
import com.apollographql.apollo3.network.ws.WebSocketEngine
3+
import com.apollographql.apollo.api.http.HttpHeader
4+
import com.apollographql.apollo.exception.ApolloNetworkException
5+
import com.apollographql.apollo.exception.ApolloWebSocketClosedException
6+
import com.apollographql.apollo.network.ws.CLOSE_NORMAL
7+
import com.apollographql.apollo.network.ws.WebSocketConnection
8+
import com.apollographql.apollo.network.ws.WebSocketEngine
99
import io.ktor.client.*
1010
import io.ktor.client.plugins.websocket.*
1111
import io.ktor.client.request.headers

‎apollo-engine-ktor/src/commonTest/kotlin/all-tests.kt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.apollographql.apollo.annotations.ApolloInternal
12
import com.apollographql.ktor.http.KtorHttpEngine
23
import com.apollographql.ktor.ws.KtorWebSocketEngine
34
import kotlinx.coroutines.Dispatchers
@@ -7,15 +8,15 @@ import kotlinx.coroutines.withContext
78
import kotlin.test.Test
89

910
class AllTests {
10-
@OptIn(ExperimentalCoroutinesApi::class)
11+
@OptIn(ExperimentalCoroutinesApi::class, ApolloInternal::class)
1112
@Test
1213
fun runAllTests() = runTest {
1314
withContext(Dispatchers.Default.limitedParallelism(1)) {
14-
// com.apollographql.apollo3.engine.tests.runAllTests(
15-
// engine = { KtorHttpEngine(it) },
16-
// webSocketEngine = { KtorWebSocketEngine() },
17-
// false
18-
// )
15+
com.apollographql.apollo.engine.tests.runAllTests(
16+
engine = { KtorHttpEngine(it) },
17+
webSocketEngine = { KtorWebSocketEngine() },
18+
false
19+
)
1920
}
2021
}
2122
}

0 commit comments

Comments
 (0)