Skip to content

Commit bf445a1

Browse files
GenieTimGenieTim
committed
Get project compiling with new dependencies
1 parent a6d5ff1 commit bf445a1

37 files changed

Lines changed: 1236 additions & 313379 deletions

‎.DS_Store‎

-8 KB
Binary file not shown.

‎.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<attributes>
55
<attribute name="optional" value="true"/>
66
<attribute name="maven.pomderived" value="true"/>
7+
<attribute name="test" value="true"/>
78
</attributes>
89
</classpathentry>
910
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">

‎.github/workflows/maven-prerelease.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# This workflow will build a Java project with Maven
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
4+
name: Prerelease Publisher
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
tags-ignore:
10+
- 'v*' # do not run on tags, as we run the full publish then
11+
paths-ignore:
12+
- 'bin/'
13+
- 'docs_manual/'
14+
- '.github/'
15+
16+
jobs:
17+
build:
18+
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Set up JDK 12
24+
uses: actions/setup-java@v1
25+
with:
26+
java-version: 12
27+
- name: Build with Maven
28+
# without -DskipTests, we also run tests, which should prevent
29+
# the package from being packaged if tests fail
30+
run: mvn -B package --file pom.xml -P dist
31+
- name: Determine Prerelease Name
32+
id: name_determiner
33+
run: echo "##[set-output name=name;]DataShot-$(date +'%Y%m%d')-beta"
34+
- name: Create Pre-release
35+
id: create_prerelease
36+
if: success()
37+
uses: actions/create-release@v1
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
with:
41+
tag_name: untagged-${{ steps.name_determiner.outputs.name }}-${{ github.sha }}
42+
release_name: ${{ steps.name_determiner.outputs.name }}
43+
body: "Momentary Snapshot Version. Refer to the git history, [commit log](https://github.com/BernhardWebstudio/PreCapture/commits/master) for current changes"
44+
draft: false
45+
prerelease: true
46+
- name: Upload Pre-release
47+
id: upload_prerelease
48+
if: success()
49+
#uses: actions/upload-release-asset@v1
50+
#env:
51+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
#with:
53+
# upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
54+
# asset_path: ./my-artifact.zip
55+
# asset_name: my-artifact.zip
56+
# asset_content_type: application/zip
57+
uses: csexton/release-asset-action@v2
58+
with:
59+
pattern: "target/Precapture*.jar"
60+
github-token: ${{ secrets.GITHUB_TOKEN }}
61+
release-url: ${{ steps.create_prerelease.outputs.upload_url }}

‎.github/workflows/maven-release.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# This workflow will build a Java project with Maven
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
4+
name: Release Publisher
5+
6+
on:
7+
create:
8+
tags:
9+
- 'v*' # run only on all tags
10+
11+
jobs:
12+
build:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Set up JDK 12
19+
uses: actions/setup-java@v1
20+
with:
21+
java-version: 12
22+
- name: Build with Maven
23+
# without -DskipTests, we also run tests, which should prevent
24+
# the package from being packaged if tests fail
25+
run: mvn -B package --file pom.xml -P dist
26+
- name: Get the version
27+
id: get_version
28+
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
29+
- name: Determine Changelog
30+
id: changelog_determiner
31+
run: echo "##[set-output name=changelog;]$(./bin/extract-changelog.sh CHANGELOG.md ${{ steps.get_version.outputs.VERSION }})"
32+
- name: Create Release
33+
id: create_release
34+
if: success()
35+
uses: actions/create-release@v1
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
with:
39+
tag_name: ${{ github.ref }}
40+
release_name: Release ${{ github.ref }}
41+
body: ${{ steps.changelog_determiner.outputs.changelog }}
42+
draft: false
43+
prerelease: false
44+
- name: Upload Release
45+
id: upload_release
46+
if: success()
47+
#uses: actions/upload-release-asset@v1
48+
#env:
49+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
#with:
51+
# upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
52+
# asset_path: ./my-artifact.zip
53+
# asset_name: my-artifact.zip
54+
# asset_content_type: application/zip
55+
uses: csexton/release-asset-action@v2
56+
with:
57+
pattern: "target/PreCapture*.jar"
58+
github-token: ${{ secrets.GITHUB_TOKEN }}
59+
release-url: ${{ steps.create_release.outputs.upload_url }}

‎.github/workflows/maven-test.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Maven Tests
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
java: [ 9, 11, 13 ]
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Set up JDK for java ${{matrix.java}}
20+
uses: actions/setup-java@v1
21+
with:
22+
java-version: ${{matrix.java}}
23+
- name: Test with Maven, Java ${{matrix.java}}
24+
run: mvn -B package --file pom.xml -P dist

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
**/*.class
2+
.DS_Store
3+
.idea
4+
PreCapture.jar

‎.settings/org.eclipse.core.resources.prefs‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1112
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1213
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
15+
org.eclipse.jdt.core.compiler.release=disabled
1316
org.eclipse.jdt.core.compiler.source=1.7

‎CHANGELOG.md‎

Whitespace-only changes.

‎PRECAPTURE2.h2.db‎

-2 KB
Binary file not shown.

0 commit comments

Comments
 (0)