From 7f833881029651505d3d3671d3eb87f8cf810a49 Mon Sep 17 00:00:00 2001 From: Arturo Jamaica Date: Fri, 11 Aug 2023 13:58:38 -0600 Subject: [PATCH 1/3] Update kotlin dependency --- .idea/kotlinc.xml | 2 +- build.gradle | 2 +- rxSolana/build.gradle | 6 +++--- solana/build.gradle | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index e1eea1d..217e5c5 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5a4a211..3d0386e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.7.20" + ext.kotlin_version = "1.8.21" repositories { google() mavenCentral() diff --git a/rxSolana/build.gradle b/rxSolana/build.gradle index cc369ff..0b2c3d9 100644 --- a/rxSolana/build.gradle +++ b/rxSolana/build.gradle @@ -55,9 +55,9 @@ dependencies { implementation "io.reactivex.rxjava2:rxkotlin:2.4.0" implementation 'com.squareup.okhttp3:okhttp:4.9.0' implementation "com.squareup.okhttp3:logging-interceptor:4.0.1" - implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' testImplementation 'junit:junit:4.13.2' } diff --git a/solana/build.gradle b/solana/build.gradle index 960e661..fc12ebf 100644 --- a/solana/build.gradle +++ b/solana/build.gradle @@ -55,14 +55,14 @@ dependencies { implementation 'org.bitcoinj:bitcoinj-core:0.16.2' implementation 'net.i2p.crypto:eddsa:0.3.0' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1' - implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1' - testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.8' + testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4' } From f0025b9a3662683af20a03797255f9cfc1ae621d Mon Sep 17 00:00:00 2001 From: Arturo Jamaica Date: Fri, 11 Aug 2023 14:03:27 -0600 Subject: [PATCH 2/3] Use graddle 7.1.1 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 3d0386e..c7e38db 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f0d08a..be1532d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 21 11:13:34 JST 2021 +#Fri Aug 11 14:02:38 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From 60f9ed093785791047405e731fd6ac7d5486437f Mon Sep 17 00:00:00 2001 From: Arturo Jamaica Date: Fri, 11 Aug 2023 14:07:11 -0600 Subject: [PATCH 3/3] throw error on Json mappers --- build.gradle | 2 +- solana/src/main/java/com/solana/api/getProgramAccounts.kt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c7e38db..54504a4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/solana/src/main/java/com/solana/api/getProgramAccounts.kt b/solana/src/main/java/com/solana/api/getProgramAccounts.kt index 5ec0f44..ac11425 100644 --- a/solana/src/main/java/com/solana/api/getProgramAccounts.kt +++ b/solana/src/main/java/com/solana/api/getProgramAccounts.kt @@ -58,6 +58,8 @@ class ProgramAccountRequest( put("bytes", filter.memcmp.bytes) } } + + else -> { throw NotImplementedError("Not implemented") } } } } @@ -70,6 +72,7 @@ class ProgramAccountRequest( is Number -> put(k, v) is String -> put(k, v) is Boolean -> put(k, v) + else -> { throw NotImplementedError("Not implemented") } } } }