Skip to content

Commit

Permalink
Merge pull request #100 from ortus-boxlang/development
Browse files Browse the repository at this point in the history
v1.0.0-Beta11
  • Loading branch information
lmajano authored Aug 23, 2024
2 parents a578258 + 4e1fb5b commit aea9c75
Show file tree
Hide file tree
Showing 172 changed files with 10,876 additions and 6,464 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ src/main/java/ortus/boxlang/web/www/testbox/

# JDBC artifacts
derby.log


# ANTLR Plugin artifacts
**/gen
21 changes: 13 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import org.apache.tools.ant.filters.ReplaceTokens

import java.nio.file.Files
import java.nio.file.StandardCopyOption
import java.text.SimpleDateFormat
import java.util.Date
import java.util.ArrayList

// https://docs.gradle.org/current/userguide/building_java_projects.html#sec:java_packaging
plugins {
Expand Down Expand Up @@ -91,7 +93,7 @@ dependencies {
testImplementation "org.junit.jupiter:junit-jupiter:5.+"
testImplementation "org.mockito:mockito-core:5.+"
testImplementation "com.google.truth:truth:1.+"
testImplementation "commons-cli:commons-cli:1.8.0"
testImplementation "commons-cli:commons-cli:1.9.0"
// https://wiremock.org/
testImplementation "org.wiremock:wiremock:3.9.1"
// https://mvnrepository.com/artifact/org.apache.derby/derby
Expand Down Expand Up @@ -122,7 +124,7 @@ dependencies {
// https://mvnrepository.com/artifact/org.slf4j/slf4j-api
implementation 'org.slf4j:slf4j-api:2.0.16'
// https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
implementation 'ch.qos.logback:logback-classic:1.5.6'
implementation 'ch.qos.logback:logback-classic:1.5.7'
// https://mvnrepository.com/artifact/com.zaxxer/HikariCP
implementation 'com.zaxxer:HikariCP:5.1.0'
// https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
Expand Down Expand Up @@ -184,7 +186,6 @@ application {
mainClass = "ortus.boxlang.runtime.BoxRunner"
}

import org.apache.tools.ant.filters.ReplaceTokens
processResources {
// Replace @build.date@ with the current date in META-INF/version.properties file
filter( ReplaceTokens, tokens: [ 'build.date': new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( new Date() ) ] )
Expand Down Expand Up @@ -226,6 +227,12 @@ shadowJar {
}
}

test {
testLogging {
events "FAILED", "STANDARD_ERROR"
}
}

/**
* Cleanup final artifacts, we only want the shadow artifacts
*/
Expand Down Expand Up @@ -265,8 +272,6 @@ task createDistributionFile( type: Zip ){
* Task moves the contents of the `libs` folder to the `distributions` folder
and must run after build
*/
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
task libsToDistro( type: Copy ) {
dependsOn build, createDistributionFile

Expand Down Expand Up @@ -512,7 +517,7 @@ spotless {
java {
target fileTree( "." ) {
include "**/*.java"
exclude "**/build/**", "bin/**", "examples/**", "src/main/java/ortus/boxlang/runtime/testing/**"
exclude "**/build/**", "bin/**", "examples/**", "src/main/java/ortus/boxlang/runtime/testing/**", "src/main/gen/**", "src/main/antlr/gen"
}
eclipse().configFile( "workbench/ortus-java-style.xml" )
toggleOffOn()
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri Aug 09 14:28:54 UTC 2024
#Fri Aug 16 15:24:09 UTC 2024
antlrVersion=4.13.1
jdkVersion=21
version=1.0.0-beta10
version=1.0.0-beta11
Loading

0 comments on commit aea9c75

Please sign in to comment.