Skip to content

Commit

Permalink
update to java 17 and gradle 8.5
Browse files Browse the repository at this point in the history
  • Loading branch information
tomcz committed Dec 12, 2023
1 parent e688faf commit a5194cb
Show file tree
Hide file tree
Showing 10 changed files with 210 additions and 151 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* text=auto eol=lf
*.{cmd,[cC][mM][dD]} text eol=crlf
*.{bat,[bB][aA][tT]} text eol=crlf
*.bat eol=crlf
*.cmd eol=crlf
4 changes: 2 additions & 2 deletions .github/workflows/build.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
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
run: make all
Expand Down
18 changes: 8 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
plugins {
id "org.jetbrains.kotlin.jvm" version "1.3.61"
id "org.jetbrains.kotlin.jvm" version "1.9.21"
id 'application'
}

repositories {
mavenCentral()
}

application {
mainClassName = 'pemToJks.MainKt'
}

defaultTasks 'clean', 'test', 'build'

repositories {
mavenCentral()
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation 'commons-cli:commons-cli:1.4'
implementation 'org.bouncycastle:bcprov-jdk15on:1.64'
testImplementation 'org.jetbrains.kotlin:kotlin-test-junit'
testImplementation 'junit:junit:4.11'
implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.77'
implementation group: 'commons-cli', name: 'commons-cli', version: '1.6.0'
testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-test'
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gradle.daemon=false
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
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.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit a5194cb

Please sign in to comment.