aboutsummaryrefslogtreecommitdiff
path: root/gradle
diff options
context:
space:
mode:
authorDierk Koenig <dierk.koenig@canoo.com>2015-02-24 00:25:21 +0100
committerDierk Koenig <dierk.koenig@canoo.com>2015-02-24 00:25:21 +0100
commitb563f27267f9fee7756284feb60797c04e6316cf (patch)
treeeee5233778c782c44f429881ab7ac3945c6631eb /gradle
parent27e2877f5b31b6c1fa387a46c20dc4cd40227ca5 (diff)
parent38d0cb914a1984b8470cf95abd480cc191cae812 (diff)
downloadfrege-gradle-plugin-b563f27267f9fee7756284feb60797c04e6316cf.tar.gz
frege-gradle-plugin-b563f27267f9fee7756284feb60797c04e6316cf.tar.bz2
frege-gradle-plugin-b563f27267f9fee7756284feb60797c04e6316cf.zip
Merge remote-tracking branch 'origin/master'
Conflicts: src/main/groovy/frege/gradle/FregePlugin.groovy
Diffstat (limited to 'gradle')
-rw-r--r--gradle/sonatype.gradle18
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
2 files changed, 10 insertions, 10 deletions
diff --git a/gradle/sonatype.gradle b/gradle/sonatype.gradle
index 528bc04..f0cf569 100644
--- a/gradle/sonatype.gradle
+++ b/gradle/sonatype.gradle
@@ -7,18 +7,18 @@ ext {
sonatypeReleaseUrl = "$sonatypeBaseUrl/service/local/staging/deploy/maven2/"
sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
- projectUrl = "https://github.com/mperry/gradle-frege-plugin"
- projectName = "GradleFregePlugin"
- pomProjectName = "GradleFregePlugin"
+ projectUrl = "https://github.com/Frege/frege-gradle-plugin"
+ projectName = "Frege Gradle Plugin"
+ pomProjectName = projectName
baseJarName = "gradle-frege-plugin"
- groupName = "com.github.mperry.frege"
- scmUrl = "git://github.com/mperry/gradle-frege-plugin.git"
- scmGitFile = "scm:git@github.com:mperry/gradle-frege-plugin.git"
- projectDescription = "Frege gradle plugin"
+ groupName = "org.frege-lang"
+ scmUrl = "git://github.com/Frege/frege-gradle-plugin.git"
+ scmGitFile = "scm:git@github.com:Frege/frege-gradle-plugin.git"
+ projectDescription = "Frege Gradle plugin"
- licenseName = "The Apache Software License, Version 2.0"
- licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ licenseName = "BSD 3-clause license"
+ licenseUrl = 'http://opensource.org/licenses/BSD-3-Clause'
organisation = groupName
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 07d978b..cee3aa1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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-2.2.1-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.3-all.zip