Skip to content

Commit

Permalink
fix(build): update gradle build to match maven updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
EDGA6280 committed May 31, 2023
1 parent 836901e commit 1889aab
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 41 deletions.
64 changes: 28 additions & 36 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.1.4'
ext.kotlin_version = '1.8.0'
repositories {
mavenCentral()
}
Expand All @@ -15,27 +15,26 @@ plugins {
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'application'
apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'eclipse'

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}



group 'nl.jworks.markdown_to_asciidoc'
version '1.1'
version '2.0.0-SNAPSHOT'

sourceCompatibility = targetCompatibility = 1.8
sourceCompatibility = targetCompatibility = 17
defaultTasks 'check'

repositories {
Expand Down Expand Up @@ -88,40 +87,23 @@ bintray {

}

publishing {
publications {
mavenJava(MavenPublication) {
if (plugins.hasPlugin('war')) {
from components.web
} else {
from components.java
}

artifact sourcesJar
artifact javadocJar
}
}
}

dependencies {
compile 'org.pegdown:pegdown:1.6.0'
compile 'org.jsoup:jsoup:1.8.1'

testCompile 'info.cukes:cucumber-picocontainer:1.1.8'
testCompile 'info.cukes:cucumber-junit:1.1.8'
testCompile 'junit:junit:4.12'
testCompile 'org.apache.commons:commons-io:1.3.2'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
}

task sourcesJar(type: Jar, dependsOn: classes) {
from sourceSets.main.allSource
classifier 'sources'
implementation 'org.pegdown:pegdown:1.6.0'
//We want to use latest parboiled version not the default one provided by pegdown
implementation 'org.parboiled:parboiled-java:1.4.1'
implementation 'org.jsoup:jsoup:1.16.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

testImplementation 'org.apache.commons:commons-io:1.3.2'
testImplementation 'io.cucumber:cucumber-picocontainer:7.11.0'
testImplementation 'io.cucumber:cucumber-junit:7.11.0'
testImplementation 'io.cucumber:cucumber-java:7.11.0'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
from javadoc.destinationDir
classifier 'javadoc'
java {
withSourcesJar()
withJavadocJar()
}

artifacts {
Expand All @@ -138,3 +120,13 @@ eclipse {
defaultOutputDir = file('build/eclipse')
}
}

publishing {
publications {
mavenJava(MavenPublication) {
from components.java
artifact sourcesJar
artifact javadocJar
}
}
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=1.0.0-SNAPSHOT
version=2.0.0-SNAPSHOT
description=Markdown to AsciiDoc converter for the JVM
5 changes: 1 addition & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@

<groupId>nl.jworks.markdown_to_asciidoc</groupId>
<artifactId>markdown_to_asciidoc</artifactId>
<version>2.0.2-SNAPSHOT</version>
<description>
fork of https://github.com/bodiam/markdown-to-asciidoc
</description>
<version>2.0.0-SNAPSHOT</version>

<properties>
<kotlin.version>1.8.0</kotlin.version>
Expand Down

0 comments on commit 1889aab

Please sign in to comment.