Skip to content

Commit 7f5b672

Browse files
authored
Fix and modernize the build (#25 fixes #24)
2 parents 0d5b320 + 4889c95 commit 7f5b672

106 files changed

Lines changed: 365 additions & 795 deletions

File tree

Some content is hidden

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

.ci/ci.sh

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

.ci/push-javadoc.sh

Lines changed: 0 additions & 37 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: changelogPrint
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
name: changelogPrint
9+
steps:
10+
- uses: actions/checkout@v3
11+
- name: jdk 11
12+
uses: actions/setup-java@v3
13+
with:
14+
java-version: 11
15+
distribution: 'temurin'
16+
- name: gradle caching
17+
uses: gradle/gradle-build-action@v2
18+
- run: ./gradlew changelogPrint

.github/workflows/gradle-build.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This workflow uses actions that are not certified by GitHub.
2+
# They are provided by a third-party and are governed by
3+
# separate terms of service, privacy policy, and support
4+
# documentation.
5+
6+
# GitHub recommends pinning actions to a commit SHA.
7+
# To get a newer version, you will need to update the SHA.
8+
# You can also reference a tag or branch, but the action may change without warning.
9+
10+
name: ci
11+
12+
on: [push]
13+
14+
jobs:
15+
build:
16+
runs-on: ubuntu-latest
17+
strategy:
18+
matrix:
19+
java: ['11']
20+
name: Java ${{ matrix.java }}
21+
steps:
22+
- uses: actions/checkout@v3
23+
- name: jdk ${{ matrix.java }}
24+
uses: actions/setup-java@v3
25+
with:
26+
java-version: ${{ matrix.java }}
27+
distribution: 'temurin'
28+
- name: gradle wrapper
29+
uses: gradle/wrapper-validation-action@v1
30+
- name: gradle caching
31+
uses: gradle/gradle-build-action@v2
32+
- run: ./gradlew test
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "Validate Gradle Wrapper"
2+
on:
3+
push:
4+
paths:
5+
- 'gradlew'
6+
- 'gradlew.bat'
7+
- 'gradle/wrapper/'
8+
pull_request:
9+
paths:
10+
- 'gradlew'
11+
- 'gradlew.bat'
12+
- 'gradle/wrapper/'
13+
14+
permissions:
15+
contents: read
16+
17+
jobs:
18+
validation:
19+
name: "Validation"
20+
runs-on: ubuntu-latest
21+
steps:
22+
- uses: actions/checkout@v3
23+
- uses: gradle/wrapper-validation-action@v1

.travis.yml

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

CHANGES.md

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
# MatConsoleCtl releases
22

3-
### Version 4.7.0-SNAPSHOT - TBD ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/snapshot/), [jcenter](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/matsim/matconsolectl/))
4-
5-
### Version 4.6.0 - November 12th 2020 ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/4.6.0/), [jcenter](https://bintray.com/diffplug/opensource/matconsolectl/4.6.0/view))
3+
## [Unreleased]
64

5+
## [4.6.0] - 2020-11-12
76
- Added checks for directories and non-exisiting files in classpath converters: In Configuration.getClassPathAsRMICodebase() and Configuration.getClassPathAsCanonicalPaths(). This prevents unnecessary IOExceptions for invalid classpaths.
87
- https://github.com/diffplug/matconsolectl/pull/21
98

10-
### Version 4.5.0 - July 18th 2017 ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/4.5.0/), [jcenter](https://bintray.com/diffplug/opensource/matconsolectl/4.5.0/view))
11-
9+
## [4.5.0] - 2017-07-18
1210
- Added `Builder.setOutputWriter` and `Builder.setErrorWriter` for capturing `stdout` and `stderr` from MATLAB. ([#20](https://github.com/diffplug/matconsolectl/pull/20))
1311

14-
### Version 4.4.4 - December 15th 2016 ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/4.4.4/), [jcenter](https://bintray.com/diffplug/opensource/matconsolectl/4.4.4/view))
15-
12+
## [4.4.4] - 2016-12-15
1613
- Yet a better fix to a bug where MatConsoleCtl would not run if there were [spaces in the path](https://github.com/diffplug/matconsolectl/issues/15) to the MatConsoleCtl jar.
1714

18-
### Version 4.4.3 - December 15th 2016 ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/4.4.3/), [jcenter](https://bintray.com/diffplug/opensource/matconsolectl/4.4.3/view))
19-
15+
## [4.4.3] - 2016-12-15
2016
- Better fix to a bug where MatConsoleCtl would not run if there were [spaces in the path](https://github.com/diffplug/matconsolectl/issues/15) to the MatConsoleCtl jar.
2117

22-
### Version 4.4.2 - July 5th 2015 ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/4.4.2/), [jcenter](https://bintray.com/diffplug/opensource/matconsolectl/4.4.2/view))
23-
18+
## [4.4.2] - 2015-07-05
2419
- Fixed a bug where MatConsoleCtl would not run if there were [spaces in the path](https://github.com/diffplug/matconsolectl/issues/11) to the MatConsoleCtl jar.
2520

26-
### Version 4.4.1 - October 16th 2015 ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/4.4.1/), [jcenter](https://bintray.com/diffplug/opensource/matconsolectl/4.4.1/view))
27-
21+
## [4.4.1] - 2015-10-16
2822
- Corrected the license in the maven metadata.
2923

30-
### Version 4.4.0 - October 16th 2015 ([javadoc](http://diffplug.github.io/matconsolectl/javadoc/4.4.0/), [jcenter](https://bintray.com/diffplug/opensource/matconsolectl/4.4.0/view))
31-
24+
## [4.4.0] - 2015-10-16
3225
- `MatlabType.MatlabTypeGetter` is now generic.
3326
- Fixed lots of compiler warnings.
3427
- Removed some [unused code](https://github.com/diffplug/matconsolectl/commit/c514188e55880528268dd3314f7347d95d00b7b6), and carefully marked code which [appears unused](https://github.com/diffplug/matconsolectl/commit/60564f2e8a80494b443d7da31c01d2e55c6d72c2) but is actually needed for internal MATLAB scripts.
@@ -38,16 +31,13 @@
3831
- Broke up the test suite into `test`, `testMatlabHeadless`, and `testMatlabInteractive`
3932
- Moved the demo code into the main library. It's a very small demo with no dependencies, makes life easier to manage one jar rather than two.
4033

41-
### Version 4.3.0 - February 23rd 2015
42-
34+
## [4.3.0] - 1015-02-23
4335
- Added OSGi compatibility.
4436

45-
### Version 4.2.1 - February 22nd 2015
46-
37+
## [4.2.1] - 2015-02-22
4738
- ThrowableWrapper now initializes the `getMessage()` field with MATLAB's raw error text.
4839

49-
### Version 4.2.0 - February 20th 2015
50-
40+
## [4.2.0] - 2015-02-20
5141
- Switched to gradle, which makes the jmistub subproject unnecessary.
5242
- Added `CopyPasteCallback` to the set of options for creating a `MatlabProxyFactory`. The factory sends a chunk of code to the callback, and the user copy-pastes this code into a MATLAB terminal to initiate a connection.
5343
+ At first, I got a bunch of Serialization errors. There were a bunch of `Serializable` classes that didn't specify a `serialVersionUID`. Specifying these seemed to fix the problem.

META-INF/MANIFEST.MF

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

0 commit comments

Comments
 (0)