Skip to content

Commit

Permalink
dependencies: Java 17
Browse files Browse the repository at this point in the history
- Gradle Wrapper 7.3
- JAudiotagger Library 3.0.1
- FX 17.0.2-ea+1
  • Loading branch information
nrittsti committed Nov 21, 2021
1 parent ec77912 commit faf8b57
Show file tree
Hide file tree
Showing 15 changed files with 222 additions and 179 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Set up JDK 15
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 15
java-version: 17
- name: Test with Gradle
run: ./gradlew test -Pplatform=linux -Ptests=Unit
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Set up JDK 15
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 15
java-version: 17
- name: Build Linux Version with Gradle
id: build-linux
run: ./gradlew jre build -Pplatform=linux -Ptests=Unit
Expand Down Expand Up @@ -88,10 +88,10 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Set up JDK 15
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 15
java-version: 17
architecture: x64
- name: Build Windows Version with Gradle
id: build-windows
Expand Down
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Chocolatey Package Manager for Windows:
See: https://chocolatey.org/install

```
choco install ntag --version=1.2.8
choco install ntag --version=1.2.11
```

Others:
Expand Down Expand Up @@ -151,17 +151,15 @@ Nuvola Icon Theme
Autor: David Vignoni
Licence: LGPL

JAudiotagger Library 2.2.5
JAudiotagger Library 3.0.1
Autor: https://www.jthink.net/jaudiotagger/
Licence: LGPL

Open JDK 15
Autor: https://jdk.java.net/15/
Licence: GPL v2 with the Classpath Exception
Open JDK 17 Autor: https://jdk.java.net/17/
Licence: GPL v2 with the Classpath Exception

OpenJFX
Autor: https://github.com/openjdk/jfx/
Licence: GPL v2 with the Classpath Exception
OpenJFX Autor: https://github.com/openjdk/jfx/
Licence: GPL v2 with the Classpath Exception

--------------------------------------------------------------------------------
End of document
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ plugins {
}

group = 'com.github'
version = '1.2.10'
sourceCompatibility = '15'
targetCompatibility = '15'
version = '1.2.11'
sourceCompatibility = '17'
targetCompatibility = '17'
jar.archiveFileName = 'ntag.jar'
distTar.archiveFileName = "ntag-${version}-${platform}_bin.tar.gz"
distZip.archiveFileName = "ntag-${version}-${platform}_bin.zip"
Expand All @@ -35,14 +35,14 @@ compileTestJava.options.encoding = "UTF-8"

repositories {
mavenCentral()
maven {
url "https://dl.bintray.com/ijabz/maven"
flatDir {
dirs 'lib'
}
}

dependencies {
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.1.4'
implementation 'net.jthink:jaudiotagger:2.2.5'
implementation 'net.jthink:jaudiotagger:3.0.1'
implementation 'org.glassfish:javax.json:1.1.4'
implementation "org.openjfx:javafx-base:${fxVersion}:${platform}"
implementation "org.openjfx:javafx-controls:${fxVersion}:${platform}"
Expand Down Expand Up @@ -106,7 +106,7 @@ distTar {

task run(type: JavaExec) {
classpath sourceSets.main.runtimeClasspath
main = "ntag.NTag"
mainClass = "ntag.NTag"
jvmArgs = [
'--module-path',
classpath.asPath,
Expand Down
7 changes: 6 additions & 1 deletion doc/history.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,9 @@ NTag Version History
1.2.10 2021-02-14
--------------------------
- New feature: Using xdg-open on Linux for opening urls
- New feature: Windows NSIS Installer
- New feature: Windows NSIS Installer

1.2.11 2021-11-15
--------------------------
- Upgrading to Java 17
- Upgrading to JAudiotagger 3.0.1
8 changes: 4 additions & 4 deletions doc/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Chocolatey Package Manager for Windows:
See: https://chocolatey.org/install

```
choco install ntag --version=1.2.8
choco install ntag --version=1.2.11
```

Others:
Expand Down Expand Up @@ -133,12 +133,12 @@ Nuvola Icon Theme
Autor: David Vignoni
Licence: LGPL

JAudiotagger Library 2.2.5
JAudiotagger Library 3.0.1
Autor: https://www.jthink.net/jaudiotagger/
Licence: LGPL

Open JDK 15
Autor: https://jdk.java.net/15/
Open JDK 17
Autor: https://jdk.java.net/17/
Licence: GPL v2 with the Classpath Exception

OpenJFX
Expand Down
5 changes: 4 additions & 1 deletion etc/com.github.nrittsti.NTag.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@
<releases>
<release version="1.2.9" date="2021-01-19">
<url>https://github.com/nrittsti/ntag/releases/tag/v1.2.9</url>
</release>
</release>
<release version="1.2.11" date="2021-11-15">
<url>https://github.com/nrittsti/ntag/releases/tag/v1.2.11</url>
</release>
</releases>
<content_rating type="oars-1.1"/>
<url type="bugtracker">https://github.com/nrittsti/ntag/issues</url>
Expand Down
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
# Copyright 2021, Nico Rittstieg
#
#

platform=linux
# platform = win
tests=Unit
fxVersion=15.0.1
jupiterVersion=5.7.0
fxVersion=17.0.2-ea+1
jupiterVersion=5.8.1
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
# You should have received a copy of the GNU General Public License
# along with NTag. If not, see <http://www.gnu.org/licenses/>.
#
# Copyright 2020, Nico Rittstieg
# Copyright 2021, Nico Rittstieg
#
#

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit faf8b57

Please sign in to comment.