diff options
11 files changed, 17 insertions, 17 deletions
diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index ffa1cc3..253787c 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml @@ -16,7 +16,7 @@ <license url="http://www.eclipse.org/org/documents/epl-v10.php"> Note: kxml2-2.3.0.jar is under the BSD license rather than the EPL. You can find a copy of the BSD License at http://www.opensource.org/licenses/bsd-license.php - Note: groovy-all-1.6.5.jar is under a BSD/Apache license rather than the EPL. For details, please see http://groovy.codehaus.org/faq.html#licence . + Note: groovy-all-1.7.0.jar is under a BSD/Apache license rather than the EPL. For details, please see http://groovy.codehaus.org/faq.html#licence . Eclipse Public License - v 1.0 diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath index 23d84a7..2fd96a4 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.adt/.classpath @@ -13,6 +13,6 @@ <classpathentry kind="lib" path="sdklib.jar" sourcepath="/SdkLib"/> <classpathentry kind="lib" path="sdkuilib.jar" sourcepath="/SdkUiLib"/> <classpathentry kind="lib" path="commons-compress-1.0.jar"/> - <classpathentry kind="lib" path="groovy-all-1.6.5.jar"/> + <classpathentry kind="lib" path="groovy-all-1.7.0.jar" sourcepath="/GroovySrc/groovy-src-1.7.0.zip"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF index 4ebf2e6..e508125 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Bundle-ClassPath: ., sdklib.jar, sdkuilib.jar, commons-compress-1.0.jar, - groovy-all-1.6.5.jar + groovy-all-1.7.0.jar Bundle-Activator: com.android.ide.eclipse.adt.AdtPlugin Bundle-Vendor: The Android Open Source Project Require-Bundle: com.android.ide.eclipse.ddms, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties index f0cfc34..47f6611 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.adt/build.properties @@ -14,7 +14,7 @@ bin.includes = plugin.xml,\ sdklib.jar,\ sdkuilib.jar,\ commons-compress-1.0.jar,\ - groovy-all-1.6.5.jar,\ + groovy-all-1.7.0.jar,\ gscripts/ source.. = src/ output.. = bin/ diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath index 73e886d..660adf3 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.tests/.classpath @@ -10,6 +10,6 @@ <classpathentry kind="lib" path="/adt/ninepatch.jar"/> <classpathentry kind="lib" path="layoutlib.jar"/> <classpathentry kind="lib" path="kxml2-2.3.0.jar"/> - <classpathentry kind="lib" path="groovy-all-1.6.5.jar"/> + <classpathentry kind="lib" path="groovy-all-1.7.0.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF index d58e715..21e4d1f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF @@ -20,4 +20,4 @@ Bundle-ClassPath: kxml2-2.3.0.jar, layoutlib_api.jar, sdklib.jar, layoutlib.jar, - groovy-all-1.6.5.jar + groovy-all-1.7.0.jar diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties index 0609485..9b92645 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/build.properties +++ b/eclipse/plugins/com.android.ide.eclipse.tests/build.properties @@ -13,5 +13,5 @@ bin.includes = META-INF/,\ unittests/com/android/sdklib/testdata/,\ unittests/com/android/layoutlib/testdata/,\ unittests/com/android/ide/eclipse/testdata/,\ - groovy-all-1.6.5.jar + groovy-all-1.7.0.jar diff --git a/eclipse/scripts/create_adt_symlinks.sh b/eclipse/scripts/create_adt_symlinks.sh index 1afbb47..46d0d33 100755 --- a/eclipse/scripts/create_adt_symlinks.sh +++ b/eclipse/scripts/create_adt_symlinks.sh @@ -28,7 +28,7 @@ if [ "$HOST" == "Linux" ]; then done ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/" ln -svf $BACK/out/host/linux-x86/framework/commons-compress-1.0.jar "$DEST/" - ln -svf $BACK/out/host/linux-x86/framework/groovy-all-1.6.5.jar "$DEST/" + ln -svf $BACK/out/host/linux-x86/framework/groovy-all-1.7.0.jar "$DEST/" elif [ "$HOST" == "Darwin" ]; then for LIB in $LIBS; do @@ -36,7 +36,7 @@ elif [ "$HOST" == "Darwin" ]; then done ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/" ln -svf $BACK/out/host/darwin-x86/framework/commons-compress-1.0.jar "$DEST/" - ln -svf $BACK/out/host/darwin-x86/framework/groovy-all-1.6.5.jar "$DEST/" + ln -svf $BACK/out/host/darwin-x86/framework/groovy-all-1.7.0.jar "$DEST/" elif [ "${HOST:0:6}" == "CYGWIN" ]; then for LIB in $LIBS; do @@ -51,8 +51,8 @@ elif [ "${HOST:0:6}" == "CYGWIN" ]; then cp -v "prebuilt/common/commons-compress/commons-compress-1.0.jar" "$DEST/" fi - if [ ! -f "$DEST/groovy-all-1.6.5.jar" ]; then - cp -v "prebuilt/common/groovy/groovy-all-1.6.5.jar" "$DEST/" + if [ ! -f "$DEST/groovy-all-1.7.0.jar" ]; then + cp -v "prebuilt/common/groovy/groovy-all-1.7.0.jar" "$DEST/" fi chmod -v a+rx "$DEST"/*.jar diff --git a/eclipse/scripts/create_test_symlinks.sh b/eclipse/scripts/create_test_symlinks.sh index 03b87a6..869515e 100755 --- a/eclipse/scripts/create_test_symlinks.sh +++ b/eclipse/scripts/create_test_symlinks.sh @@ -34,20 +34,20 @@ HOST=`uname` if [ "$HOST" == "Linux" ]; then ln -svf $BACK/out/host/linux-x86/framework/kxml2-2.3.0.jar "$DEST/" ln -svf $BACK/out/host/linux-x86/framework/layoutlib.jar "$DEST/" - ln -svf $BACK/out/host/linux-x86/framework/groovy-all-1.6.5.jar "$DEST/" + ln -svf $BACK/out/host/linux-x86/framework/groovy-all-1.7.0.jar "$DEST/" elif [ "$HOST" == "Darwin" ]; then ln -svf $BACK/out/host/darwin-x86/framework/kxml2-2.3.0.jar "$DEST/" ln -svf $BACK/out/host/darwin-x86/framework/layoutlib.jar "$DEST/" - ln -svf $BACK/out/host/darwin-x86/framework/groovy-all-1.6.5.jar "$DEST/" + ln -svf $BACK/out/host/darwin-x86/framework/groovy-all-1.7.0.jar "$DEST/" elif [ "${HOST:0:6}" == "CYGWIN" ]; then if [ ! -f "$DEST/kxml2-2.3.0.jar" ]; then cp -v "prebuilt/common/kxml2/kxml2-2.3.0.jar" "$DEST/" fi - if [ ! -f "$DEST/groovy-all-1.6.5.jar" ]; then - cp -v "prebuilt/common/groovy/groovy-all-1.6.5.jar" "$DEST/" + if [ ! -f "$DEST/groovy-all-1.7.0.jar" ]; then + cp -v "prebuilt/common/groovy/groovy-all-1.7.0.jar" "$DEST/" fi LIBS="layoutlib.jar" diff --git a/layoutopt/app/etc/manifest.txt b/layoutopt/app/etc/manifest.txt index 5d0afdf..d107744 100644 --- a/layoutopt/app/etc/manifest.txt +++ b/layoutopt/app/etc/manifest.txt @@ -1,2 +1,2 @@ Main-Class: com.android.layoutopt.cli.Main -Class-Path: groovy-all-1.6.5.jar +Class-Path: groovy-all-1.7.0.jar diff --git a/layoutopt/libs/uix/src/Android.mk b/layoutopt/libs/uix/src/Android.mk index 65abcbc..c41b09e 100644 --- a/layoutopt/libs/uix/src/Android.mk +++ b/layoutopt/libs/uix/src/Android.mk @@ -8,6 +8,6 @@ LOCAL_JAVA_RESOURCE_DIRS := resources LOCAL_MODULE := uix LOCAL_JAVA_LIBRARIES := \ - groovy-all-1.6.5 + groovy-all-1.7.0 include $(BUILD_HOST_JAVA_LIBRARY) |