Skip to content

Commit

Permalink
Merge pull request #131 from metaplex-foundation/fix/koltin-update-de…
Browse files Browse the repository at this point in the history
…pendencies

Update kotlin dependency
  • Loading branch information
ajamaica authored Aug 11, 2023
2 parents 43543e2 + 60f9ed0 commit f03b0ea
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// 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()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
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
Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions rxSolana/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
10 changes: 5 additions & 5 deletions solana/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

}

Expand Down
3 changes: 3 additions & 0 deletions solana/src/main/java/com/solana/api/getProgramAccounts.kt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ class ProgramAccountRequest(
put("bytes", filter.memcmp.bytes)
}
}

else -> { throw NotImplementedError("Not implemented") }
}
}
}
Expand All @@ -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") }
}
}
}
Expand Down

0 comments on commit f03b0ea

Please sign in to comment.