Skip to content

Commit 75ec92e

Browse files
committed
updates gradle to 2.11, adds more lint options
1 parent b8b8159 commit 75ec92e

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

build.gradle

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ apply plugin: 'eclipse'
1010

1111
group = 'com.tokbox'
1212
archivesBaseName = 'opentok-server-sdk'
13-
// TODO: how do we increment this before/after a release for deployment and development?
1413
version = '2.3.2-alpha.1'
1514

16-
sourceCompatibility = 1.6
17-
1815
task javadocJar(type: Jar) {
1916
classifier = 'javadoc'
2017
from javadoc
@@ -85,7 +82,7 @@ uploadArchives {
8582
pom.project {
8683
name 'OpenTok Java SDK'
8784
packaging 'jar'
88-
description 'The OpenTok Ruby SDK lets you generate sessions and tokens for OpenTok applications. This version of the SDK also includes support for working with OpenTok 2.0 archives.'
85+
description 'The OpenTok Java SDK lets you generate sessions and tokens for OpenTok applications. This version of the SDK also includes support for working with OpenTok 2.0 archives.'
8986
url 'http://www.tokbox.com/opentok'
9087

9188
scm {
@@ -123,3 +120,16 @@ uploadArchives {
123120
test {
124121
maxHeapSize = "1024m"
125122
}
123+
124+
sourceCompatibility = 1.7
125+
// credit: http://stackoverflow.com/a/22681854/305340
126+
tasks.withType(JavaCompile) {
127+
options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
128+
doFirst {
129+
if (System.env.JDK7_HOME != null) {
130+
options.bootClasspath = "$System.env.JDK7_HOME/jre/lib/rt.jar"
131+
options.bootClasspath += "$File.pathSeparator$System.env.JDK7_HOME/jre/lib/jce.jar"
132+
// and other specific JDK jars
133+
}
134+
}
135+
}

gradle/wrapper/gradle-wrapper.jar

3.06 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Feb 18 12:24:59 EST 2015
1+
#Mon Feb 08 14:24:11 PST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-2.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip

gradlew

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ case "`uname`" in
4242
;;
4343
esac
4444

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
5045
# Attempt to set APP_HOME
5146
# Resolve links: $0 may be a link
5247
PRG="$0"
@@ -114,6 +109,7 @@ fi
114109
if $cygwin ; then
115110
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116111
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112+
JAVACMD=`cygpath --unix "$JAVACMD"`
117113

118114
# We build the pattern for arguments to be converted via cygpath
119115
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

0 commit comments

Comments
 (0)