From a939588df870cefd91db52e446c0f0d9a7cef2f8 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Tue, 17 Sep 2013 18:10:52 +0000
Subject: [PATCH] - upgrade to gradle 1.7
STEPS
cd ~/dev/tools
wget http://services.gradle.org/distributions/gradle-1.7-bin.zip
unzip gradle-1.7-bin.zip
ln -s gradle-1.7 gradle
vi ~/.profile
export GRADLE_HOME=$HOME/dev/tools/gradle
export PATH=$PATH:$GRADLE_HOME/bin
source ~/.profile
---
bbb-video/build.gradle | 22 +++++-----------------
bbb-voice/build.gradle | 22 +++++-----------------
bigbluebutton-apps/build.gradle | 16 ++++++++--------
deskshare/app/build.gradle | 10 +++++-----
deskshare/applet/build.gradle | 6 +++---
deskshare/build.gradle | 14 +++++++-------
deskshare/common/build.gradle | 4 ++--
7 files changed, 35 insertions(+), 59 deletions(-)
diff --git a/bbb-video/build.gradle b/bbb-video/build.gradle
index ac994cecff..333bb0283a 100755
--- a/bbb-video/build.gradle
+++ b/bbb-video/build.gradle
@@ -1,27 +1,15 @@
-usePlugin 'java'
-usePlugin 'war'
-usePlugin 'eclipse'
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'eclipse'
version = '0.7'
jar.enabled = true
archivesBaseName = 'video'
-task dependencies(type: Copy) {
+task resolveDeps(type: Copy) {
into('lib')
from configurations.default
- from configurations.default.allArtifacts*.file
-}
-
-task resolveDeps(dependsOn: configurations.default.buildArtifacts, type: Copy) {
- into('lib')
- from configurations.default
- from configurations.default.allArtifacts*.file
-}
-
-task resolveDependencies(dependsOn: configurations.default.buildArtifacts, type: Copy) {
- into('lib')
- from configurations.default
- from configurations.default.allArtifacts*.file
+ from configurations.default.allArtifacts.file
}
repositories {
diff --git a/bbb-voice/build.gradle b/bbb-voice/build.gradle
index fe54c6172a..21137a340c 100755
--- a/bbb-voice/build.gradle
+++ b/bbb-voice/build.gradle
@@ -1,27 +1,15 @@
-usePlugin 'java'
-usePlugin 'war'
-usePlugin 'eclipse'
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'eclipse'
version = '0.7'
jar.enabled = true
archivesBaseName = 'sip'
-task dependencies(type: Copy) {
+task resolveDeps(type: Copy) {
into('lib')
from configurations.default
- from configurations.default.allArtifacts*.file
-}
-
-task resolveDeps(dependsOn: configurations.default.buildArtifacts, type: Copy) {
- into('lib')
- from configurations.default
- from configurations.default.allArtifacts*.file
-}
-
-task resolveDependencies(dependsOn: configurations.default.buildArtifacts, type: Copy) {
- into('lib')
- from configurations.default
- from configurations.default.allArtifacts*.file
+ from configurations.default.allArtifacts.file
}
repositories {
diff --git a/bigbluebutton-apps/build.gradle b/bigbluebutton-apps/build.gradle
index 3064fd240b..922e55a15b 100755
--- a/bigbluebutton-apps/build.gradle
+++ b/bigbluebutton-apps/build.gradle
@@ -1,7 +1,7 @@
-usePlugin 'scala'
-usePlugin 'java'
-usePlugin 'war'
-usePlugin 'eclipse'
+apply plugin: 'scala'
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'eclipse'
version = '0.8'
jar.enabled = true
@@ -10,10 +10,10 @@ def appName = 'bigbluebutton'
archivesBaseName = appName
-task resolveDeps(dependsOn: configurations.default.buildArtifacts, type: Copy) {
+task resolveDeps(type: Copy) {
into('lib')
from configurations.default
- from configurations.default.allArtifacts*.file
+ from configurations.default.allArtifacts.file
}
repositories {
@@ -107,8 +107,8 @@ dependencies {
compile 'org.scala-lang:scala-library:2.9.2'
// workaround for http://issues.gradle.org/browse/GRADLE-1273
- compileScala.classpath = sourceSets.main.compileClasspath + files(sourceSets.main.classesDir)
- compileTestScala.classpath = sourceSets.test.compileClasspath + files(sourceSets.test.classesDir)
+ //compileScala.classpath = sourceSets.main.compileClasspath + files(sourceSets.main.classesDir)
+ //compileTestScala.classpath = sourceSets.test.compileClasspath + files(sourceSets.test.classesDir)
// Freeswitch ESL Client
compile 'org/freeswitch:fs-esl-client:0.8.2@jar'
diff --git a/deskshare/app/build.gradle b/deskshare/app/build.gradle
index 33fba69102..28f9f6515e 100755
--- a/deskshare/app/build.gradle
+++ b/deskshare/app/build.gradle
@@ -1,6 +1,6 @@
-usePlugin 'scala'
-usePlugin 'java'
-usePlugin 'war'
+apply plugin: 'scala'
+apply plugin: 'java'
+apply plugin: 'war'
version = '0.71'
@@ -67,8 +67,8 @@ dependencies {
scalaTools 'org.scala-lang:scala-library:2.9.2'
// workaround for http://issues.gradle.org/browse/GRADLE-1273
- compileScala.classpath = sourceSets.main.compileClasspath + files(sourceSets.main.classesDir)
- compileTestScala.classpath = sourceSets.test.compileClasspath + files(sourceSets.test.classesDir)
+ //compileScala.classpath = sourceSets.main.compileClasspath + files(sourceSets.main.classesDir)
+ //compileTestScala.classpath = sourceSets.test.compileClasspath + files(sourceSets.test.classesDir)
// Libraries needed for scala api
compile 'org.scala-lang:scala-library:2.9.2'
diff --git a/deskshare/applet/build.gradle b/deskshare/applet/build.gradle
index 249e944abd..b3de7256b2 100755
--- a/deskshare/applet/build.gradle
+++ b/deskshare/applet/build.gradle
@@ -1,4 +1,5 @@
-usePlugin 'java'
+apply plugin: 'java'
+
sourceCompatibility=1.6
targetCompatibility=1.6
@@ -25,8 +26,7 @@ jar.doFirst {
* Combine the common classes into the applet's jar because we
* do not want to sign and manage 2 jar files.
**/'''
-
- jar.merge('../common/build/libs/bbb-deskshare-common-0.8.jar')
+ jar.from zipTree('../common/build/libs/bbb-deskshare-common-0.8.jar')
}
jar {
diff --git a/deskshare/build.gradle b/deskshare/build.gradle
index 3c559b79fa..ee48337041 100755
--- a/deskshare/build.gradle
+++ b/deskshare/build.gradle
@@ -1,11 +1,11 @@
-usePlugin 'scala'
-usePlugin 'java'
-usePlugin 'eclipse'
+apply plugin: 'scala'
+apply plugin: 'java'
+apply plugin: 'eclipse'
-task resolveDeps(dependsOn: configurations.default.buildArtifacts, type: Copy) {
+task resolveDeps(type: Copy) {
into('lib')
from configurations.default
- from configurations.default.allArtifacts*.file
+ from configurations.default.allArtifacts.file
}
/*
@@ -121,8 +121,8 @@ test {
}
subprojects {
- usePlugin 'java'
- usePlugin 'eclipse'
+ apply plugin: 'java'
+ apply plugin: 'eclipse'
repositories {
add(new org.apache.ivy.plugins.resolver.ChainResolver()) {
diff --git a/deskshare/common/build.gradle b/deskshare/common/build.gradle
index 1cc02757fd..440371a9d6 100755
--- a/deskshare/common/build.gradle
+++ b/deskshare/common/build.gradle
@@ -1,3 +1,3 @@
-usePlugin 'java'
+apply plugin: 'java'
version = '0.8'
-archivesBaseName = 'bbb-deskshare-common'
\ No newline at end of file
+archivesBaseName = 'bbb-deskshare-common'
--
GitLab