aboutsummaryrefslogtreecommitdiff
path: root/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'build.gradle')
-rw-r--r--build.gradle48
1 files changed, 12 insertions, 36 deletions
diff --git a/build.gradle b/build.gradle
index 8d58aea..d3dd514 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
apply plugin: "groovy"
-apply plugin: "maven"
+apply plugin: "maven-publish" // I don't think we need this at all
apply plugin: "signing"
apply plugin: "idea"
@@ -19,35 +19,11 @@ ext {
fregeBaseVersion = "3.25.84"
fregeClassifier = ""
- fregeVersion = "$fregeBaseVersion$fregeClassifier"
-
- // work around https://issues.gradle.org/browse/GRADLE-3281
- // fixed in 0.9.3 https://plugins.gradle.org/plugin/com.gradle.plugin-publish
-// def home = new File(System.getProperty("user.home"))
-// def propfile = new File(home, ".gradle/gradle.properties")
-// if (propfile.exists()) {
-// props = new Properties()
-// propfile.withReader {
-// props.load(it)
-// def keyName = "gradle.publish.key"
-// def key = props.getProperty(keyName)
-// if (key == null) {
-// println "No key named $keyName found in ${propfile.absolutePath}"
-// }
-// def secretName = "gradle.publish.secret"
-// def secret = props.getProperty(secretName)
-// if (secret == null) {
-// println "No key named $secretName found in ${propfile.absolutePath}"
-// }
-// if (key != null && secret != null) {
-// System.setProperty "gradle.publish.key", props.'gradle.publish.key'
-// System.setProperty "gradle.publish.secret", props.'gradle.publish.secret'
-// }
-// }
-// } else println "cannot find '$propfile.absolutePath'"
+ fregeVersion = fregeBaseVersion + fregeClassifier
+
}
-apply from: "gradle/sonatype.gradle"
+// apply from: "gradle/sonatype.gradle" // not sure why that is here
version = projectVersion
group = projectGroup
@@ -62,16 +38,16 @@ repositories {
}
dependencies {
- compile "$projectGroup:frege:$fregeVersion"
- compile "$projectGroup:frege-repl-core:1.2"
- compile "$projectGroup:frege-native-gen:1.3"
- compile "org.functionaljava:functionaljava:4.4"
+ implementation "$projectGroup:frege:$fregeVersion"
+ // api "$projectGroup:frege-repl-core:1.2" // this now comes with the frege distro
+ implementation "$projectGroup:frege-native-gen:1.3"
+ // api "org.functionaljava:functionaljava:4.4" // try without
- compile gradleApi()
- compile localGroovy()
- testCompile gradleTestKit()
+ implementation gradleApi()
+ implementation localGroovy()
+ testImplementation gradleTestKit()
- testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
+ testImplementation('org.spockframework:spock-core:1.0-groovy-2.4') {
exclude module: 'groovy-all'
}
}