Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
.gradle
build


/.settings
/bin
**/.settings
**/bin
.classpath
.project

Expand Down
20 changes: 10 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
allprojects {
afterEvaluate {
tasks.withType(Test) {
finalizedBy ':testReport'
testReport.reportOn binResultsDir
reports.html.enabled = false
reports.junitXml.destination = file("${rootProject.buildDir}/test-results")
}
}
tasks.withType(Test) {
finalizedBy ':testReport'
testReport.reportOn binaryResultsDirectory
reports.html.required = false
reports.junitXml.destination = file("${rootProject.buildDir}/test-results")
}
}
}

task testReport(type: TestReport) {
description 'Generates test report for all projects'
destinationDir = file("$buildDir/reports")
}
description 'Generates test report for all projects'
destinationDirectory = file("$buildDir/reports")
}
6 changes: 2 additions & 4 deletions gradle-ssh-plugin/acceptance-test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@ plugins {
}

repositories {
jcenter()
mavenCentral()
}

dependencies {
testCompile('org.spockframework:spock-core:1.2-groovy-2.5') {
exclude module: 'groovy-all'
}
implementation 'org.spockframework:spock-core:2.3-groovy-3.0'
}

evaluationDependsOn(':gradle-ssh-plugin:core')
Expand Down
65 changes: 24 additions & 41 deletions gradle-ssh-plugin/core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,58 +1,41 @@
plugins {
id 'groovy'
id 'maven-publish'
id 'com.jfrog.bintray' version '1.8.4'
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
id 'groovy'
id 'groovy-gradle-plugin'
id 'maven-publish'
}

repositories {
jcenter()
mavenCentral()
maven {
url = uri("https://maven.pkg.github.com/int128/groovy-ssh")
}
}

dependencies {
compile gradleApi()
compile localGroovy()
compile('org.hidetake:groovy-ssh:2.10.1') {
exclude module: 'groovy-all'
}
testCompile('org.spockframework:spock-core:1.2-groovy-2.5') {
exclude module: 'groovy-all'
}
testCompile 'cglib:cglib-nodep:3.2.10'
implementation gradleApi()
implementation('org.hidetake:groovy-ssh:2.8.0')
testImplementation 'junit:junit:4.12'
testImplementation('org.spockframework:spock-core:2.3-groovy-3.0')
testImplementation 'cglib:cglib-nodep:3.2.10'
}

test {
useJUnitPlatform()
}

group = 'org.hidetake'
version = System.getenv('CIRCLE_TAG') ?: 'SNAPSHOT'

processResources {
filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: ['version': project.version])
filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: ['version': project.version])
}

publishing {
publications {
maven(MavenPublication) {
from components.java
groupId project.group
artifactId parent.name
}
}
}

bintray {
user = System.getenv('BINTRAY_USER') ?: findProperty('bintrayUser')
key = System.getenv('BINTRAY_KEY') ?: findProperty('bintrayKey')
publications = ['maven']
publish = true
pkg {
repo = 'maven'
name = parent.name
version {
attributes = ['gradle-plugin': 'org.hidetake.ssh:org.hidetake:gradle-ssh-plugin']
name = project.version
}
}
publications {
maven(MavenPublication) {
from components.java
groupId project.group
artifactId parent.name
}
}
}
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.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading