Skip to content

Upgraded plugin to support Gradle 7.2 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robsonke merged 1 commit into from
Oct 21, 2021
Merged

Upgraded plugin to support Gradle 7.2 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 33 additions & 34 deletions microdocs-core-java/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
group 'com.maxxton'
version '2.0.4'

apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'maven'
apply plugin: 'signing'
apply plugin: 'maven-publish'

group 'com.maxxton'
version '3.0.0'

repositories {
mavenCentral()
}
Expand Down Expand Up @@ -38,44 +37,44 @@ signing {
sign configurations.archives
}

uploadArchives {
repositories {
mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

// switch local with remote repo for local development
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: sonatypeUsername, password: sonatypePassword)
}
// repository(url: mavenLocal().url)

pom.project {
name 'MicroDocs Core Java'
packaging 'jar'
description 'MicroDocs core functionalities to share accross various projects'
url 'https://github.com/MaxxtonGroup/microdocs'

scm {
url 'scm:git@github.com:MaxxtonGroup/microdocs.git'
connection 'scm:git@github.com:MaxxtonGroup/microdocs.git'
developerConnection 'scm:git@github.com:MaxxtonGroup/microdocs.git'
}

publishing {
publications {
mavenJava(MavenPublication) {
from components.java
pom {
name = 'MicroDocs Core Java'
description = 'MicroDocs core functionalities to share accross various projects'
url = 'https://github.com/MaxxtonGroup/microdocs'
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution = 'repo'
}
}

developers {
developer {
id 's.hermans'
name 'Steven Hermans'
id = 's.hermans'
name = 'Steven Hermans'
}
}
scm {
url = 'scm:git@github.com:MaxxtonGroup/microdocs.git'
connection = 'scm:git@github.com:MaxxtonGroup/microdocs.git'
developerConnection = 'scm:git@github.com:MaxxtonGroup/microdocs.git'
}
}
}
}
}
repositories {
// switch local with remote repo for local development
maven {
url "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
credentials {
username = sonatypeUsername
password = sonatypePassword
}
}
// mavenLocal()
}
}
2 changes: 1 addition & 1 deletion microdocs-core-java/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions microdocs-crawler-doclet/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'maven'
apply plugin: 'maven-publish'

repositories {
mavenCentral()
Expand All @@ -11,12 +11,12 @@ dependencies {
api gradleApi()
api 'org.codehaus.groovy:groovy-all:2.5.8'
api("com.fasterxml.jackson.core:jackson-databind:2.10.1")
api("com.maxxton:microdocs-core-java:2.0.4")
api("com.maxxton:microdocs-core-java:3.0.0")
api("junit:junit:4.12")
}

group = 'com.maxxton'
version = '2.0.4'
version = '3.0.0'

task fatJar(type: Jar) {
manifest {
Expand Down
68 changes: 34 additions & 34 deletions microdocs-crawler-gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: 'groovy'
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'maven'
apply plugin: 'signing'
apply plugin: 'maven-publish'

Expand All @@ -22,16 +21,17 @@ dependencies {
api gradleApi()
api("com.fasterxml.jackson.core:jackson-databind:2.10.1")
api("com.mashape.unirest:unirest-java:1.4.9")
api("com.maxxton:microdocs-core-java:2.0.4")
api("com.maxxton:microdocs-core-java:3.0.0")
}

group = 'com.maxxton'
version = '2.0.4'
version = '3.0.0'


task fatJar(type: Jar, dependsOn: 'jar') {
archiveBaseName = project.name
from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
configurations.api.setCanBeResolved(true)
from { configurations.api.collect { it.isDirectory() ? it : zipTree(it) } }
include('com/maxxton/**')
include('com/fasterxml/**')
include('com/mashape/**')
Expand Down Expand Up @@ -65,44 +65,44 @@ signing {
sign configurations.archives
}

uploadArchives {
repositories {
mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }

// switch local with remote repo for local development
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
authentication(userName: sonatypeUsername, password: sonatypePassword)
}
// repository(url: mavenLocal().url)

pom.project {
name 'MicroDocs Gradle Crawler'
packaging 'jar'
description 'MicroDocs crawler for gradle projects'
url 'https://github.com/MaxxtonGroup/microdocs'

scm {
url 'scm:git@github.com:MaxxtonGroup/microdocs.git'
connection 'scm:git@github.com:MaxxtonGroup/microdocs.git'
developerConnection 'scm:git@github.com:MaxxtonGroup/microdocs.git'
}

publishing {
publications {
mavenJava(MavenPublication) {
from components.java
pom {
name = 'MicroDocs Gradle Crawler'
description = 'MicroDocs crawler for gradle projects'
url = 'https://github.com/MaxxtonGroup/microdocs'
licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
name = 'The Apache Software License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution = 'repo'
}
}

developers {
developer {
id 's.hermans'
name 'Steven Hermans'
id = 's.hermans'
name = 'Steven Hermans'
}
}
scm {
url = 'scm:git@github.com:MaxxtonGroup/microdocs.git'
connection = 'scm:git@github.com:MaxxtonGroup/microdocs.git'
developerConnection = 'scm:git@github.com:MaxxtonGroup/microdocs.git'
}
}
}
}
}
repositories {
// switch local with remote repo for local development
maven {
url "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
credentials {
username = sonatypeUsername
password = sonatypePassword
}
}
// mavenLocal()
}
}
2 changes: 1 addition & 1 deletion microdocs-crawler-gradle/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Binary file modified microdocs-crawler-gradle/src/main/resources/microdocs-crawler-doclet.jar
View file
Open in desktop
Binary file not shown.