Skip to content

Commit f928022

Browse files
committed
Make GHPR optional for build. Update Gradle & dependencies.
1 parent bb3f32c commit f928022

File tree

6 files changed

+24
-14
lines changed

6 files changed

+24
-14
lines changed

gradle/sava.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
productDescription=Native Solana & SPL Program Clients
22
javaVersion=25
3-
solanaBOMVersion=25.0.5
3+
solanaBOMVersion=25.6.4

gradle/wrapper/gradle-wrapper.jar

176 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 0 additions & 3 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 & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
1+
rootProject.name = "solana-programs"
2+
13
pluginManagement {
24
repositories {
35
gradlePluginPortal()
4-
maven {
5-
name = "savaGithubPackages"
6-
url = uri("https://maven.pkg.github.com/sava-software/sava-build")
7-
credentials(PasswordCredentials::class)
6+
mavenCentral()
7+
val gprUser = providers.gradleProperty("savaGithubPackagesUsername")
8+
.orElse(providers.environmentVariable("ORG_GRADLE_PROJECT_savaGithubPackagesUsername"))
9+
.orElse(providers.environmentVariable("GITHUB_ACTOR"))
10+
.orNull
11+
val gprToken = providers.gradleProperty("savaGithubPackagesPassword")
12+
.orElse(providers.environmentVariable("ORG_GRADLE_PROJECT_savaGithubPackagesPassword"))
13+
.orElse(providers.environmentVariable("GITHUB_TOKEN"))
14+
.orNull
15+
if (gprUser != null && gprToken != null) {
16+
maven {
17+
url = uri("https://maven.pkg.github.com/sava-software/sava-build")
18+
credentials {
19+
username = gprUser
20+
password = gprToken
21+
}
22+
}
823
}
24+
// includeBuild("../sava-build")
925
}
1026
}
1127

1228
plugins {
13-
id("software.sava.build") version "0.2.2"
29+
id("software.sava.build") version "21.3.2"
1430
}
1531

16-
rootProject.name = "solana-programs"
17-
1832
javaModules {
1933
directory(".") {
2034
group = "software.sava"

0 commit comments

Comments
 (0)