Skip to content

Commit 0b72f0a

Browse files
authored
Update Gradle, AGP, and dependencies (#83)
* Update Gradle, AGP, and dependencies * Update JDK to 17
1 parent 612792b commit 0b72f0a

File tree

7 files changed

+29
-28
lines changed

7 files changed

+29
-28
lines changed

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- uses: actions/checkout@v4
1818
with:
1919
submodules: true
20-
- name: set up JDK 11
20+
- name: set up JDK 17
2121
uses: actions/setup-java@v4
2222
with:
23-
java-version: '11'
23+
java-version: '17'
2424
distribution: 'temurin'
2525
cache: gradle
2626

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

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

1313
nexusPublishing {

digitalassetlinks/build.gradle

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
plugins {
66
id 'com.android.library'
7-
id 'com.google.protobuf' version "0.9.4"
7+
id 'com.google.protobuf' version '0.9.4'
88
id 'maven-publish'
99
id 'signing'
1010
}
1111

1212
android {
1313
namespace = 'com.solana.digitalassetlinks'
14-
compileSdk 33
14+
compileSdk 34
1515

1616
defaultConfig {
1717
minSdk 23
18-
targetSdk 33
18+
targetSdk 34
1919

2020
consumerProguardFiles "consumer-rules.pro"
2121
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -107,14 +107,8 @@ signing {
107107

108108
protobuf {
109109
protoc {
110-
def archSuffix = ''
111-
if (osdetector.os == "osx") {
112-
// Workaround: there are no published protoc binaries for Apple Silicon-based macs.
113-
// Apply a manual architecture to the artifact to select the osx-x86_64 variant, which
114-
// runs fine with Rosetta.
115-
archSuffix = ':osx-x86_64'
116-
}
117-
artifact = "com.google.protobuf:protoc:3.23.1$archSuffix" // Download from repositories
110+
def protoc_ver = '4.28.2'
111+
artifact = "com.google.protobuf:protoc:$protoc_ver" // Download from repositories
118112
}
119113
generateProtoTasks {
120114
all().each { task ->
@@ -147,13 +141,14 @@ tasks.whenTaskAdded { task ->
147141
}
148142

149143
dependencies {
150-
compileOnly 'androidx.annotation:annotation:1.6.0'
151-
testImplementation 'com.google.protobuf:protobuf-java:3.25.2'
144+
compileOnly 'androidx.annotation:annotation:1.8.2'
145+
testImplementation 'androidx.annotation:annotation:1.8.2'
146+
testImplementation 'com.google.protobuf:protobuf-java:4.28.2'
152147
testImplementation 'junit:junit:4.13.2'
153148
testImplementation 'org.mockito:mockito-inline:5.2.0'
154-
testImplementation 'org.robolectric:robolectric:4.11.1'
155-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
156-
androidTestImplementation 'androidx.test:rules:1.5.0'
157-
androidTestImplementation 'androidx.test:runner:1.5.2'
149+
testImplementation 'org.robolectric:robolectric:4.13'
150+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
151+
androidTestImplementation 'androidx.test:rules:1.6.1'
152+
androidTestImplementation 'androidx.test:runner:1.6.2'
158153
androidTestImplementation 'junit:junit:4.13.2'
159154
}

gradle/wrapper/gradle-wrapper.jar

852 Bytes
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)