diff options
| -rw-r--r-- | README.adoc | 30 | ||||
| -rw-r--r-- | build.gradle | 46 | ||||
| -rw-r--r-- | gradle.properties | 8 | ||||
| -rw-r--r-- | gradle/sonatype.gradle | 95 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
5 files changed, 22 insertions, 161 deletions
diff --git a/README.adoc b/README.adoc index e8f3b81..c635ae0 100644 --- a/README.adoc +++ b/README.adoc @@ -3,34 +3,10 @@ This is the official Gradle plugin to compile Frege projects (https://github.com/Frege/frege). See the example project, https://github.com/mperry/frege-gradle-example, for how to use this plugin. -The latest release is 0.4.1. Note that the 0.3 experimented with _github releases_ and http://jitpack.io. There seems to be access issues to the 0.3 release, please use the 0.4-SNAPSHOT snapshot release. += How to refer to on a gradle build -[source, groovy] ----- -buildscript { // make the frege plugin available in our build - repositories { - mavenLocal() // if you have the plugin installed locally, this is enough - maven { - url "https://oss.sonatype.org/content/groups/public" - } - } - dependencies { - classpath 'org.frege-lang:frege-gradle-plugin:0.4.1' - } -} ----- - - -To locally install this plugin use - - gradlew clean install - - -NOTE: There is no need to install gradle or anything else beside a recent Java version. - It is all self-installing. +See https://plugins.gradle.org/plugin/org.frege-lang = Continuous Integration -The Travis CI build of this repository is at https://travis-ci.org/Frege/frege-gradle-plugin/ . - -The snapshot builds are automatically deployed to Sonatype at https://oss.sonatype.org/content/groups/public/org/frege-lang/frege-gradle-plugin/. +The Travis CI build of this repository is at https://travis-ci.org/Frege/frege-gradle-plugin/ .
\ No newline at end of file diff --git a/build.gradle b/build.gradle index 174ccb4..bcf47c5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,4 @@ - -buildscript { - repositories { - mavenLocal() - mavenCentral() - } - dependencies { - classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3" - classpath "com.github.mperry:frege-gradle-release-plugin:0.1" - } -} - apply plugin: "groovy" -apply plugin: "maven" -apply plugin: "signing" -apply plugin: 'io.codearte.nexus-staging' -apply plugin: 'frege-release' defaultTasks "build" @@ -30,21 +14,26 @@ ext { fregeBaseVersion = "3.23.288" fregeClassifier = "-gaa3af0c" fregeVersion = "$fregeBaseVersion$fregeClassifier" + + // work around https://issues.gradle.org/browse/GRADLE-3281 + def home = new File(System.getProperty("user.home")) + def propfile = new File(home, ".gradle/gradle.properties") + props = new Properties() + propfile.withReader { + props.load(it) + System.setProperty "gradle.publish.key" , props.'gradle.publish.key' + System.setProperty "gradle.publish.secret", props.'gradle.publish.secret' + } } -apply from: "gradle/sonatype.gradle" +version = projectVersion +group = 'org.frege-lang' repositories { mavenLocal() - maven { - url = sonatypeRepositoryUrl - } mavenCentral() } -version = projectVersion -group = groupName - dependencies { compile "org.frege-lang:frege:$fregeVersion" compile "org.frege-lang:frege-repl-core:1.2" @@ -53,12 +42,9 @@ dependencies { compile localGroovy() } -nexusStaging { - packageGroup = groupName - stagingProfileId = "a622b6773bea07" -} -// First, apply the publishing plugin +// using the publishing plugin + buildscript { repositories { maven { @@ -72,7 +58,7 @@ buildscript { // Details on how to publish to the gradle plugin portal // Go to http://plugins.gradle.org, get yourself a publishing key -// and add it under ~/.gradle/gradle.properties +// and add it to ~/.gradle/gradle.properties as // For publishing, run the task publishPlugins. apply plugin: "com.gradle.plugin-publish" @@ -81,7 +67,7 @@ apply plugin: "com.gradle.plugin-publish" // configured to publish your plugin to the plugin portal pluginBundle { website = 'https://github.com/Frege/frege-gradle-plugin' - vcsUrl = 'https://github.com/Frege/frege-gradle-plugin' + vcsUrl = 'https://github.com/Frege/frege-gradle-plugin' description = 'Enabling Frege for compilation, testing, documentation, and supporting tools.' tags = ['frege', 'haskell', 'java'] diff --git a/gradle.properties b/gradle.properties index 6a37d97..f60ca17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1 @@ - -signingEnabled = false -sonatypeUsername = incorrectUsername -sonatypePassword = incorrectPassword - -nexusUsername = incorrectUsername -nexusPassword = incorrectPassword +#currently not needed
\ No newline at end of file diff --git a/gradle/sonatype.gradle b/gradle/sonatype.gradle deleted file mode 100644 index f0cf569..0000000 --- a/gradle/sonatype.gradle +++ /dev/null @@ -1,95 +0,0 @@ - -ext { - - sonatypeBaseUrl = "https://oss.sonatype.org" - sonatypeSnapshotUrl = "$sonatypeBaseUrl/content/repositories/snapshots/" - sonatypeRepositoryUrl = "$sonatypeBaseUrl/content/groups/public" - sonatypeReleaseUrl = "$sonatypeBaseUrl/service/local/staging/deploy/maven2/" - sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl - - projectUrl = "https://github.com/Frege/frege-gradle-plugin" - projectName = "Frege Gradle Plugin" - pomProjectName = projectName - baseJarName = "gradle-frege-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 = "BSD 3-clause license" - licenseUrl = 'http://opensource.org/licenses/BSD-3-Clause' - - organisation = groupName - - primaryEmail = "frege-programming-language@googlegroups.com" - -} - -Boolean doSigning() { - signingEnabled.trim() == "true" -} - -task javadocJar(type: Jar, dependsOn: "javadoc") { - classifier = 'javadoc' - from "build/docs/javadoc" -} - -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - classifier = 'sources' -} - -artifacts { - archives jar - archives javadocJar - archives sourcesJar -} - -signing { - required { doSigning() } - sign configurations.archives -} - -uploadArchives { - enabled = true - repositories { - mavenDeployer { - if (doSigning()) { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - } - - repository(url: sonatypeUploadUrl) { - authentication(userName: sonatypeUsername, password: sonatypePassword) - } - pom { - groupId = groupName - project { - name pomProjectName - packaging 'jar' - description projectDescription - url projectUrl - organization { - name pomProjectName - url projectUrl - } - scm { - url scmUrl - } - licenses { - license { - name licenseName - url licenseUrl - distribution 'repo' - } - } - developers { - developer { - email primaryEmail - } - } - } - } - } - } -}
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 330b106..ac404a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Aug 30 17:39:41 CEST 2015 +#Thu Sep 03 23:57:28 CEST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-all.zip |