Updated to bld 1.7.4.

Updated to RIFE2 1.7.2.
Fixes vscode settings.
This commit is contained in:
Geert Bevin 2023-10-10 17:24:52 -04:00
parent 052de93ed6
commit 459a916906
7 changed files with 9 additions and 8 deletions

View file

@ -12,14 +12,14 @@ jobs:
steps: steps:
- name: Checkout source repository - name: Checkout source repository
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Set up JDK ${{ matrix.java-version }} - name: Set up JDK ${{ matrix.java-version }}
uses: actions/setup-java@v3 uses: actions/setup-java@v3
with: with:
distribution: 'temurin' distribution: 'corretto'
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
- name: Run tests - name: Run tests

4
.idea/app.iml generated
View file

@ -6,10 +6,10 @@
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" relativeOutputPath="resources" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/src/main/resources/templates" /> <sourceFolder url="file://$MODULE_DIR$/src/main/webapp" type="java-resource" relativeOutputPath="resources" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />

View file

@ -2,11 +2,11 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.7.2.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-1.7.4.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.bld/dist/bld-1.7.2-sources.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-1.7.4-sources.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

View file

@ -8,6 +8,7 @@
], ],
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [ "java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-1.7.4.jar",
"lib/compile/*.jar", "lib/compile/*.jar",
"lib/runtime/*.jar", "lib/runtime/*.jar",
"lib/standalone/*.jar", "lib/standalone/*.jar",

Binary file not shown.

View file

@ -3,4 +3,4 @@ bld.downloadExtensionSources=true
bld.extensions= bld.extensions=
bld.repositories=MAVEN_CENTRAL,RIFE2 bld.repositories=MAVEN_CENTRAL,RIFE2
bld.downloadLocation= bld.downloadLocation=
bld.version=1.7.2 bld.version=1.7.4

View file

@ -22,7 +22,7 @@ public class AppBuild extends WebProject {
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
scope(compile) scope(compile)
.include(dependency("com.uwyn.rife2", "rife2", version(1,7,0))); .include(dependency("com.uwyn.rife2", "rife2", version(1,7,2)));
scope(test) scope(test)
.include(dependency("org.jsoup", "jsoup", version(1,16,1))) .include(dependency("org.jsoup", "jsoup", version(1,16,1)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,3))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,3)))