Skip to content

Commit

Permalink
Update dependencies (#85)
Browse files Browse the repository at this point in the history
* Update Gradle, AGP, and dependencies

* Update JDK to 17
  • Loading branch information
sdlaver authored Oct 7, 2024
1 parent 4694d91 commit aeae532
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v4
- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: gradle

Expand Down
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ plugins {

android {
namespace 'com.solana.pay.sample'
compileSdk 33
compileSdk 34

defaultConfig {
applicationId "com.solana.pay.sample"
minSdk 23
targetSdk 33
targetSdk 34
versionCode 1
versionName "1.0"
}
Expand All @@ -41,13 +41,13 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.solanamobile:digital-asset-links-android:1.0.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
implementation 'com.google.android.material:material:1.12.0'
implementation 'com.solanamobile:digital-asset-links-android:1.0.4'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
implementation project(path: ':pay')
}
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.4.2' apply false
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
id 'com.android.application' version '8.7.0' apply false
id 'com.android.library' version '8.7.0' apply false
id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
}

nexusPublishing {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 5 additions & 4 deletions pay/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ plugins {

android {
namespace 'com.solana.pay'
compileSdk 33
compileSdk 34

defaultConfig {
minSdk 23
targetSdk 33
targetSdk 34

consumerProguardFiles "consumer-rules.pro"
}
Expand Down Expand Up @@ -117,7 +117,8 @@ tasks.whenTaskAdded { task ->
}

dependencies {
compileOnly 'androidx.annotation:annotation:1.6.0'
compileOnly 'androidx.annotation:annotation:1.8.2'
testImplementation 'androidx.annotation:annotation:1.8.2'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.11.1'
testImplementation 'org.robolectric:robolectric:4.13'
}

0 comments on commit aeae532

Please sign in to comment.