Skip to content

Commit 7ba5ab9

Browse files
authored
Merge pull request #162 from ortus-boxlang/development
1.0.0-Beta27
2 parents 5ae4c1d + c0492e4 commit 7ba5ab9

File tree

194 files changed

+7373
-3465
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+7373
-3465
lines changed

.github/workflows/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
#############################################
6262
build:
6363
uses: ./.github/workflows/release.yml
64-
needs: [tests, format]
64+
needs: [format, tests]
6565
secrets: inherit
6666
permissions:
6767
checks: write

build.gradle

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
33
import java.nio.file.Files
44
import java.nio.file.StandardCopyOption
55
import java.text.SimpleDateFormat
6+
import java.lang.management.ManagementFactory
67

78
// https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_packaging
89
plugins {
@@ -12,15 +13,15 @@ plugins {
1213
id "application"
1314
id 'antlr'
1415
// For source code formatting
15-
id "com.diffplug.spotless" version "7.0.1"
16+
id "com.diffplug.spotless" version "7.0.2"
1617
// For building shadow jars with jdk 17 ONLY
1718
//id 'com.github.johnrengelman.shadow' version '8.1.1'
1819
// For building shadow jars using JDK 21 +, they had to fork
1920
id "io.github.goooler.shadow" version "8.1.8"
2021
// For dependency updates
21-
id 'com.github.ben-manes.versions' version '0.51.0'
22+
id 'com.github.ben-manes.versions' version '0.52.0'
2223
// For building service loader files
23-
id "com.github.harbby.gradle.serviceloader" version "1.1.8"
24+
id "com.github.harbby.gradle.serviceloader" version "1.1.9"
2425
// Maven Publisher
2526
id 'maven-publish'
2627
id 'signing'
@@ -92,7 +93,7 @@ repositories {
9293
*/
9394
dependencies {
9495
// Testing Dependencies
95-
testImplementation "org.junit.jupiter:junit-jupiter:5.+"
96+
testImplementation "org.junit.jupiter:junit-jupiter:5.11.3"
9697
testImplementation "org.mockito:mockito-core:5.+"
9798
testImplementation "com.google.truth:truth:1.+"
9899
testImplementation "commons-cli:commons-cli:1.9.0"
@@ -136,7 +137,7 @@ dependencies {
136137
// https://mvnrepository.com/artifact/org.ow2.asm/asm-util
137138
implementation 'org.ow2.asm:asm-util:9.7.1'
138139
// https://mvnrepository.com/artifact/org.semver4j/semver4j
139-
implementation 'org.semver4j:semver4j:5.5.0'
140+
implementation 'org.semver4j:semver4j:5.6.0'
140141

141142
}
142143

@@ -234,14 +235,6 @@ shadowJar {
234235
}
235236
}
236237

237-
test {
238-
systemProperty 'boxlang.experimental.compiler', System.getProperty('boxlang.experimental.compiler', "java")
239-
240-
testLogging {
241-
events "FAILED", "STANDARD_ERROR"
242-
}
243-
}
244-
245238
/**
246239
* Cleanup final artifacts, we only want the shadow artifacts
247240
*/
@@ -393,13 +386,6 @@ publishing {
393386
organization = "Ortus Solutions, Corp"
394387
organizationUrl = "https://www.ortussolutions.com"
395388
}
396-
developer {
397-
id = "gpickin"
398-
name = "Gavin Pickin"
399-
400-
organization = "Ortus Solutions, Corp"
401-
organizationUrl = "https://www.ortussolutions.com"
402-
}
403389
developer {
404390
id = "ericpeterson"
405391
name = "Eric Peterson"
@@ -563,7 +549,7 @@ spotless {
563549
java {
564550
target fileTree( "." ) {
565551
include "**/*.java"
566-
exclude "**/build/**", "bin/**", "examples/**", "src/main/java/ortus/boxlang/runtime/testing/**", "src/main/gen/**", "src/main/antlr/gen"
552+
exclude "**/build/**", "bin/**", "examples/**", "src/main/java/ortus/boxlang/runtime/testing/**", "src/main/gen/**", "src/main/antlr/gen", "modules/**"
567553
}
568554
eclipse().configFile( "workbench/ortus-java-style.xml" )
569555
toggleOffOn()
@@ -601,13 +587,39 @@ task parseBifDocs( type: Javadoc, dependsOn: compileJava ) {
601587
/**
602588
* Test Task Customizations
603589
*/
590+
task createHeapDump {
591+
doLast {
592+
def name = ManagementFactory.getRuntimeMXBean().getName()
593+
def pid = name.split("@")[0]
594+
if (pid != null) {
595+
def timestamp = new Date().format("yyyyMMddHHmmss")
596+
def dumpFileName = "build/heapdumps/${timestamp}/heapdump.hprof"
597+
exec {
598+
commandLine 'mkdir', '-p', 'build/heapdumps/' + timestamp
599+
}
600+
exec {
601+
commandLine 'jmap', '-dump:live,file=' + dumpFileName, pid
602+
}
603+
println "Heap dump created: $dumpFileName"
604+
} else {
605+
println "PID not provided. Cannot create heap dump."
606+
}
607+
}
608+
}
609+
604610
test {
611+
// IMPORTANT: Do not leave this uncommented and commit or all tests locally will run on the specified compiler
612+
// systemProperty 'boxlang.experimental.compiler', System.getProperty('boxlang.experimental.compiler', "java")
605613
useJUnitPlatform()
606614
testLogging {
607615
showStandardStreams = true
616+
events "FAILED", "STANDARD_ERROR"
608617
}
609618
dependsOn compileJava, compileTestJava
610619
//exclude '**/resources/**'
620+
621+
// Uncomment to take a heap dump after the conclusion of tests
622+
// finalizedBy( createHeapDump )
611623
}
612624

613625
/**
@@ -654,8 +666,3 @@ task getDependencies( type: Copy ) {
654666
from sourceSets.main.runtimeClasspath
655667
into 'build/dependencies/'
656668
}
657-
spotless{
658-
java{
659-
targetExclude 'modules/**'
660-
}
661-
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Fri Dec 13 21:14:22 UTC 2024
1+
#Fri Jan 17 16:08:07 UTC 2025
22
antlrVersion=4.13.1
33
jdkVersion=21
4-
version=1.0.0-beta26
4+
version=1.0.0-beta27

0 commit comments

Comments
 (0)