Update gradle and deps.

jpe7s · jpe7s · commit 978a4ffdef7b · 2025-05-04T08:51:24.000-05:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/actions/wrapper-validation@v3
+      - uses: gradle/actions/wrapper-validation@v4
 
       - uses: oracle-actions/setup-java@v1
         if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION_GA }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/actions/wrapper-validation@v3
+      - uses: gradle/actions/wrapper-validation@v4
 
       - uses: oracle-actions/setup-java@v1
         if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION_GA }}
diff --git a/README.md b/README.md
@@ -188,3 +188,9 @@ number.
 
 Mapping configuration files from the [glam-sdk repository](https://github.com/glamsystems/glam-sdk/tree/main/remapping) 
 are needed to run the tests.  Run [./downloadMappings.sh](downloadMappings.sh) to pull only those files into this project.
+
+### Sync Re-mapping JSON Files
+
+```shell
+./syncMappings.sh
+```
diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@ ext {
   VCS_URL = 'https://github.com/glamsystems/ix-proxy'
 }
 
-apply plugin: 'java-library'
-apply plugin: 'maven-publish'
+apply(plugin: 'java-library')
+apply(plugin: 'maven-publish')
 
 project.group = 'systems.glam'
 project.version = "$VERSION"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle b/settings.gradle
@@ -20,7 +20,7 @@ dependencyResolutionManagement {
   }
   versionCatalogs {
     libs {
-      from("software.sava:solana-version-catalog:0.5.138")
+      from("software.sava:solana-version-catalog:0.6.32")
     }
   }
 }
diff --git a/syncMappings.sh b/syncMappings.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd glam
+git pull
+cd ..
+
+exit 0

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ ext {`
`3`	`3`	`VCS_URL = 'https://github.com/glamsystems/ix-proxy'`
`4`	`4`	`}`
`5`	`5`
`6`		`-apply plugin: 'java-library'`
`7`		`-apply plugin: 'maven-publish'`
	`6`	`+apply(plugin: 'java-library')`
	`7`	`+apply(plugin: 'maven-publish')`
`8`	`8`
`9`	`9`	`project.group = 'systems.glam'`
`10`	`10`	`project.version = "$VERSION"`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ dependencyResolutionManagement {`
`20`	`20`	`}`
`21`	`21`	`versionCatalogs {`
`22`	`22`	`libs {`
`23`		`- from("software.sava:solana-version-catalog:0.5.138")`
	`23`	`+ from("software.sava:solana-version-catalog:0.6.32")`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +#!/usr/bin/env bash
++
 +set -e
++
 +cd glam
 +git pull
 +cd ..
++
 +exit 0