Skip to content

Commit

Permalink
Gradle update (#1)
Browse files Browse the repository at this point in the history
* update gradle wrapper for jdk 17

* keep on using make all
  • Loading branch information
tomcz committed Jun 4, 2023
1 parent f9773ad commit b3b7063
Show file tree
Hide file tree
Showing 8 changed files with 200 additions and 176 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
- name: Build with Gradle
run: make all
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'
- name: Build with Gradle
run: make all
Expand Down
1 change: 0 additions & 1 deletion .java-version

This file was deleted.

57 changes: 14 additions & 43 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,54 +1,25 @@
plugins {
id 'com.github.johnrengelman.shadow' version '5.2.0'
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '8.1.1'
}

repositories {
mavenCentral()
}

configurations.all {
exclude(group: 'commons-logging')
}

configurations {
compress
mavenCentral()
}

dependencies {
implementation 'org.jdom:jdom:1.1.3'
implementation 'com.jgoodies:forms:1.2.1'
implementation 'com.formdev:flatlaf:1.1.1'
implementation 'commons-io:commons-io:2.4'
implementation 'commons-lang:commons-lang:2.6'
implementation 'org.antlr:stringtemplate:3.2.1'
implementation 'commons-codec:commons-codec:1.7'
implementation 'org.bouncycastle:bcprov-jdk16:1.46'
implementation 'net.sf.opencsv:opencsv:2.3'

compile 'org.jdom:jdom:1.1.3'
compile 'com.jgoodies:forms:1.2.1'
compile 'com.formdev:flatlaf:1.1.1'
compile 'commons-io:commons-io:2.4'
compile 'commons-lang:commons-lang:2.6'
compile 'org.antlr:stringtemplate:3.2.1'
compile 'commons-codec:commons-codec:1.7'
compile 'org.bouncycastle:bcprov-jdk16:1.46'
compile 'net.sf.opencsv:opencsv:2.3'

testCompile 'junit:junit:4.10'

compress 'com.yahoo.platform.yui:yuicompressor:2.4.7'
testImplementation 'junit:junit:4.10'
}

task(compressjs, type: JavaExec) {
classpath = configurations.compress
main = 'com.yahoo.platform.yui.compressor.Bootstrap'
args('-o src/main/resources/com/tomczarniecki/jpasskeep/resources/jpasskeep-min.js javascript/jpasskeep.js'.split(' '))
}
mainClassName = 'com.tomczarniecki.jpasskeep.Main'

task(compresscss, type: JavaExec) {
classpath = configurations.compress
main = 'com.yahoo.platform.yui.compressor.Bootstrap'
args('-o src/main/resources/com/tomczarniecki/jpasskeep/resources/jpasskeep-min.css javascript/jpasskeep.css'.split(' '))
}

jar {
manifest {
attributes(
'Main-Class': 'com.tomczarniecki.jpasskeep.Main',
'Implementation-Version': version?: 'dev'
)
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b3b7063

Please sign in to comment.