Skip to content

Fix useMavenNKLocal() so it works with latest Gradle #19

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix useMavenNKLocal() so it works with latest Gradle #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6230c68
Mark local maven repository as being allowed to use non-secure protoc…
cjcormack Dec 30, 2021
101c530
Minor tweaks so it builds on newer platforms.
cjcormack Feb 22, 2023
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies {

// Test Dependencies
// Friends don't let friends use other unit testing frameworks...
testImplementation('org.spockframework:spock-core:0.7-groovy-2.0') {
testImplementation('org.spockframework:spock-core:2.3-groovy-3.0') {
exclude module: "groovy-all"
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-3.3-bin.zip
distributionUrl=https://services.gradle.org/distributions/gradle-3.3-bin.zip
1 change: 0 additions & 1 deletion src/main/groovy/org/netkernel/gradle/plugin/NetKernelPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import org.gradle.api.tasks.Delete
import org.gradle.api.publish.*
import org.gradle.api.publish.maven.tasks.PublishToMavenRepository;
import org.gradle.api.tasks.bundling.Jar
import org.gradle.internal.impldep.org.apache.maven.project.ProjectUtils;
import org.netkernel.gradle.plugin.model.*
import org.netkernel.gradle.plugin.tasks.*
import org.gradle.util.GradleVersion
Expand Down
12 changes: 9 additions & 3 deletions src/main/groovy/org/netkernel/gradle/plugin/model/NetKernelExtension.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,23 @@ class NetKernelExtension {
}

void useMavenNKLocal() {
useMaven propertyHelper.findProjectProperty(project, PropertyHelper.MAVEN_LOCAL_URL)
useMaven(propertyHelper.findProjectProperty(project, PropertyHelper.MAVEN_LOCAL_URL), true)
}

void useMavenNK() {
println("******Added Official NetKernel Repo********")
useMaven propertyHelper.findProjectProperty(project, PropertyHelper.MAVEN_NETKERNEL_URL)
}

void useMaven(String repoURL) {
void useMaven(String repoURL, boolean mAllowInsecureProtocol = false) {
println("Adding repo: ${repoURL}")
project.repositories.maven { url repoURL }
project.repositories.maven {
url repoURL
if (mAllowInsecureProtocol) {
println("Setting allowInsecureProtocol for repo")
allowInsecureProtocol = true
}
}
}

void useMavenCentral() {
Expand Down