Skip to content

Commit

Permalink
🐳 chore: Upgrade toolchain
Browse files Browse the repository at this point in the history
* Upgrade rust toolchain to v1.82.0
* Upgrade gradle to v8.10.2
* Upgrade Javet to v4.1.0
  • Loading branch information
caoccao committed Nov 21, 2024
1 parent c4b05f4 commit 23d5676
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/swc4j_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
with:
gradle-version: 8.5
gradle-version: 8.10.2

- name: Build and Test
run: |
Expand Down
14 changes: 2 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object Config {
}

object Projects {
const val JAVET = "com.caoccao.javet:javet-core:${Versions.JAVET}"
const val JAVET = "com.caoccao.javet:javet:${Versions.JAVET}"
val JAVET_BINARY = {
val os = OperatingSystem.current()
val arch = System.getProperty("os.arch")
Expand All @@ -63,7 +63,7 @@ object Config {

object Versions {
const val JAVA_VERSION = "1.8"
const val JAVET = "4.0.0"
const val JAVET = "4.1.0"
const val JUNIT = "5.11.3"
const val SWC4J = "1.3.0"
}
Expand Down Expand Up @@ -92,16 +92,6 @@ java {
}

dependencies {
val os = OperatingSystem.current()
val arch = System.getProperty("os.arch")
val isI18n = false
val isNode = false
val i18nType = if (isI18n) "-i18n" else ""
val jsRuntimeTimeType = if (isNode) "node" else "v8"
val osType = if (os.isWindows) "windows" else
if (os.isMacOsX) "macos" else
if (os.isLinux) "linux" else ""
val archType = if (arch == "aarch64" || arch == "arm64") "arm64" else "x86_64"
testImplementation(Config.Projects.JAVET)
testImplementation(Config.Projects.JAVET_BINARY())
}
Expand Down
1 change: 1 addition & 0 deletions docs/release_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 1.3.0

* Upgraded rust toolchain to v1.82.0
* Added `find()` to `ISwc4jAst`
* Added `getMinusCount()` to `Swc4jAstNumber`
* Added `getBangCount()`, `getLogicalOperatorCount()`, `getParentBinExpr()` to `Swc4jAstBinExpr`
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion rust/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.81.0"
channel = "1.82.0"
components = ["clippy", "rustfmt"]
profile = "minimal"

0 comments on commit 23d5676

Please sign in to comment.