From a0f4f0c9465cb20ef72f51ff3413202721a8f473 Mon Sep 17 00:00:00 2001 From: funkatronics Date: Tue, 9 Jan 2024 17:07:18 -0700 Subject: [PATCH 1/2] fix package names --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../networking/OkHttpDriver.kt | 2 +- .../okiodriver/OkHttpDriverTest.kt | 12 ++++++------ .../networking/HttpDriver.kt | 2 +- .../networking/Rpc20Driver.kt | 4 ++-- .../rpccore/JsonRpcDriver.kt | 2 +- .../{funkatronics => solana}/rpccore/RpcRequest.kt | 2 +- .../{funkatronics => solana}/rpccore/RpcResponse.kt | 2 +- .../{funkatronics => solana}/rpccore/RpcCoreTest.kt | 11 +++++------ .../{funkatronics => solana}/util/MockHttpDriver.kt | 6 +++--- 10 files changed, 22 insertions(+), 23 deletions(-) rename okiodriver/src/commonMain/kotlin/com/{funkatronics => solana}/networking/OkHttpDriver.kt (96%) rename okiodriver/src/commonTest/kotlin/com/{funkatronics => solana}/okiodriver/OkHttpDriverTest.kt (95%) rename rpccore/src/commonMain/kotlin/com/{funkatronics => solana}/networking/HttpDriver.kt (86%) rename rpccore/src/commonMain/kotlin/com/{funkatronics => solana}/networking/Rpc20Driver.kt (94%) rename rpccore/src/commonMain/kotlin/com/{funkatronics => solana}/rpccore/JsonRpcDriver.kt (96%) rename rpccore/src/commonMain/kotlin/com/{funkatronics => solana}/rpccore/RpcRequest.kt (96%) rename rpccore/src/commonMain/kotlin/com/{funkatronics => solana}/rpccore/RpcResponse.kt (94%) rename rpccore/src/commonTest/kotlin/com/{funkatronics => solana}/rpccore/RpcCoreTest.kt (94%) rename rpccore/src/commonTest/kotlin/com/{funkatronics => solana}/util/MockHttpDriver.kt (53%) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..fae0804 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/okiodriver/src/commonMain/kotlin/com/funkatronics/networking/OkHttpDriver.kt b/okiodriver/src/commonMain/kotlin/com/solana/networking/OkHttpDriver.kt similarity index 96% rename from okiodriver/src/commonMain/kotlin/com/funkatronics/networking/OkHttpDriver.kt rename to okiodriver/src/commonMain/kotlin/com/solana/networking/OkHttpDriver.kt index e34b60c..da31b69 100644 --- a/okiodriver/src/commonMain/kotlin/com/funkatronics/networking/OkHttpDriver.kt +++ b/okiodriver/src/commonMain/kotlin/com/solana/networking/OkHttpDriver.kt @@ -1,4 +1,4 @@ -package com.funkatronics.networking +package com.solana.networking import okhttp3.OkHttpClient import okhttp3.Request diff --git a/okiodriver/src/commonTest/kotlin/com/funkatronics/okiodriver/OkHttpDriverTest.kt b/okiodriver/src/commonTest/kotlin/com/solana/okiodriver/OkHttpDriverTest.kt similarity index 95% rename from okiodriver/src/commonTest/kotlin/com/funkatronics/okiodriver/OkHttpDriverTest.kt rename to okiodriver/src/commonTest/kotlin/com/solana/okiodriver/OkHttpDriverTest.kt index 51d744f..a6bd829 100644 --- a/okiodriver/src/commonTest/kotlin/com/funkatronics/okiodriver/OkHttpDriverTest.kt +++ b/okiodriver/src/commonTest/kotlin/com/solana/okiodriver/OkHttpDriverTest.kt @@ -1,10 +1,10 @@ -package com.funkatronics.okiodriver +package com.solana.okiodriver -import com.funkatronics.networking.HttpRequest -import com.funkatronics.networking.OkHttpNetworkDriver -import com.funkatronics.networking.Rpc20Driver -import com.funkatronics.rpccore.JsonRpc20Request -import com.funkatronics.rpccore.makeRequest +import com.solana.networking.HttpRequest +import com.solana.networking.OkHttpNetworkDriver +import com.solana.networking.Rpc20Driver +import com.solana.rpccore.JsonRpc20Request +import com.solana.rpccore.makeRequest import kotlinx.coroutines.test.runTest import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.SerialDescriptor diff --git a/rpccore/src/commonMain/kotlin/com/funkatronics/networking/HttpDriver.kt b/rpccore/src/commonMain/kotlin/com/solana/networking/HttpDriver.kt similarity index 86% rename from rpccore/src/commonMain/kotlin/com/funkatronics/networking/HttpDriver.kt rename to rpccore/src/commonMain/kotlin/com/solana/networking/HttpDriver.kt index bdf31f0..8301ba3 100644 --- a/rpccore/src/commonMain/kotlin/com/funkatronics/networking/HttpDriver.kt +++ b/rpccore/src/commonMain/kotlin/com/solana/networking/HttpDriver.kt @@ -1,4 +1,4 @@ -package com.funkatronics.networking +package com.solana.networking interface HttpRequest { val url: String diff --git a/rpccore/src/commonMain/kotlin/com/funkatronics/networking/Rpc20Driver.kt b/rpccore/src/commonMain/kotlin/com/solana/networking/Rpc20Driver.kt similarity index 94% rename from rpccore/src/commonMain/kotlin/com/funkatronics/networking/Rpc20Driver.kt rename to rpccore/src/commonMain/kotlin/com/solana/networking/Rpc20Driver.kt index 4d03b69..3daffc0 100644 --- a/rpccore/src/commonMain/kotlin/com/funkatronics/networking/Rpc20Driver.kt +++ b/rpccore/src/commonMain/kotlin/com/solana/networking/Rpc20Driver.kt @@ -1,6 +1,6 @@ -package com.funkatronics.networking +package com.solana.networking -import com.funkatronics.rpccore.* +import com.solana.rpccore.* import kotlinx.serialization.KSerializer import kotlinx.serialization.json.Json diff --git a/rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/JsonRpcDriver.kt b/rpccore/src/commonMain/kotlin/com/solana/rpccore/JsonRpcDriver.kt similarity index 96% rename from rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/JsonRpcDriver.kt rename to rpccore/src/commonMain/kotlin/com/solana/rpccore/JsonRpcDriver.kt index 3277659..992e5a3 100644 --- a/rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/JsonRpcDriver.kt +++ b/rpccore/src/commonMain/kotlin/com/solana/rpccore/JsonRpcDriver.kt @@ -1,4 +1,4 @@ -package com.funkatronics.rpccore +package com.solana.rpccore import kotlinx.serialization.KSerializer import kotlinx.serialization.json.JsonElement diff --git a/rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/RpcRequest.kt b/rpccore/src/commonMain/kotlin/com/solana/rpccore/RpcRequest.kt similarity index 96% rename from rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/RpcRequest.kt rename to rpccore/src/commonMain/kotlin/com/solana/rpccore/RpcRequest.kt index dff75ba..838dcea 100644 --- a/rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/RpcRequest.kt +++ b/rpccore/src/commonMain/kotlin/com/solana/rpccore/RpcRequest.kt @@ -1,4 +1,4 @@ -package com.funkatronics.rpccore +package com.solana.rpccore import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.EncodeDefault diff --git a/rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/RpcResponse.kt b/rpccore/src/commonMain/kotlin/com/solana/rpccore/RpcResponse.kt similarity index 94% rename from rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/RpcResponse.kt rename to rpccore/src/commonMain/kotlin/com/solana/rpccore/RpcResponse.kt index 9658d78..f3e06f1 100644 --- a/rpccore/src/commonMain/kotlin/com/funkatronics/rpccore/RpcResponse.kt +++ b/rpccore/src/commonMain/kotlin/com/solana/rpccore/RpcResponse.kt @@ -1,4 +1,4 @@ -package com.funkatronics.rpccore +package com.solana.rpccore import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonElement diff --git a/rpccore/src/commonTest/kotlin/com/funkatronics/rpccore/RpcCoreTest.kt b/rpccore/src/commonTest/kotlin/com/solana/rpccore/RpcCoreTest.kt similarity index 94% rename from rpccore/src/commonTest/kotlin/com/funkatronics/rpccore/RpcCoreTest.kt rename to rpccore/src/commonTest/kotlin/com/solana/rpccore/RpcCoreTest.kt index 44726df..62fadca 100644 --- a/rpccore/src/commonTest/kotlin/com/funkatronics/rpccore/RpcCoreTest.kt +++ b/rpccore/src/commonTest/kotlin/com/solana/rpccore/RpcCoreTest.kt @@ -1,11 +1,10 @@ -package com.funkatronics.rpccore +package com.solana.rpccore -import com.funkatronics.networking.HttpNetworkDriver -import com.funkatronics.networking.HttpRequest -import com.funkatronics.networking.Rpc20Driver -import com.funkatronics.util.MockHttpDriver +import com.solana.networking.HttpNetworkDriver +import com.solana.networking.HttpRequest +import com.solana.networking.Rpc20Driver +import com.solana.util.MockHttpDriver import kotlinx.coroutines.test.runTest -import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.put diff --git a/rpccore/src/commonTest/kotlin/com/funkatronics/util/MockHttpDriver.kt b/rpccore/src/commonTest/kotlin/com/solana/util/MockHttpDriver.kt similarity index 53% rename from rpccore/src/commonTest/kotlin/com/funkatronics/util/MockHttpDriver.kt rename to rpccore/src/commonTest/kotlin/com/solana/util/MockHttpDriver.kt index bbf0af2..9699843 100644 --- a/rpccore/src/commonTest/kotlin/com/funkatronics/util/MockHttpDriver.kt +++ b/rpccore/src/commonTest/kotlin/com/solana/util/MockHttpDriver.kt @@ -1,7 +1,7 @@ -package com.funkatronics.util +package com.solana.util -import com.funkatronics.networking.HttpNetworkDriver -import com.funkatronics.networking.HttpRequest +import com.solana.networking.HttpNetworkDriver +import com.solana.networking.HttpRequest class MockHttpDriver(val response: String) : HttpNetworkDriver { override suspend fun makeHttpRequest(request: HttpRequest): String = response From 213a82306a5c3592ca3ec1c828e08cba7dfe1333 Mon Sep 17 00:00:00 2001 From: funkatronics Date: Tue, 9 Jan 2024 17:08:21 -0700 Subject: [PATCH 2/2] revert gradle --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..ae04661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists