diff options
24 files changed, 37 insertions, 37 deletions
diff --git a/eclipse/features/com.android.ide.eclipse.adt.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.ndk/feature.xml index 253a45e..c6aef3c 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.ndk/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt.ndk/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.adt.ndk" label="Android Native Development Tools" - version="16.0.0.qualifier" + version="17.0.0.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index d9799b5..5b5511b 100644 --- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.adt" label="Android Development Tools" - version="16.0.0.qualifier" + version="17.0.0.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.adt"> diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml index 2674494..6607b33 100644 --- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.ddms" label="Android DDMS" - version="16.0.0.qualifier" + version="17.0.0.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.ddms"> diff --git a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml index f3502a4..f3c7c44 100644 --- a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.gldebugger" label="GLESv2 Debugger Client" - version="16.0.0.qualifier" + version="17.0.0.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml index 7145ddc..0cde667 100644 --- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.hierarchyviewer" label="Android Hierarchy Viewer" - version="16.0.0.qualifier" + version="17.0.0.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.hierarchyviewer"> diff --git a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml index 2b66bf9..471ea08 100644 --- a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.pdt" label="Android Platform Development Tools" - version="16.0.0.qualifier" + version="17.0.0.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.tests/feature.xml b/eclipse/features/com.android.ide.eclipse.tests/feature.xml index bdffe11..0d28db2 100644 --- a/eclipse/features/com.android.ide.eclipse.tests/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.tests/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.tests" label="ADT Tests" - version="16.0.0.qualifier" + version="17.0.0.qualifier" provider-name="The Android Open Source Project"> <copyright> diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml index 4aa71ff..92882c1 100644 --- a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.traceview" label="Android Traceview" - version="16.0.0.qualifier" + version="17.0.0.qualifier" provider-name="The Android Open Source Project" plugin="com.android.ide.eclipse.traceview"> diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF index e5eb2ba..40400bc 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT CDT Integration Bundle-SymbolicName: com.android.ide.eclipse.adt.ndk;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.adt.ndk.internal.Activator Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF index 4d3ffff..5f6786f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT XML Overlay Bundle-SymbolicName: overlay.com.android.ide.eclipse.adt.overlay;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, 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 b668616..5af2280 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Android Development Toolkit Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-ClassPath: ., libs/androidprefs.jar, libs/sdklib.jar, diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF index 6a0332b..e7cc0f9 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.ddms.DdmsPlugin Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF index 56fe874..360455a 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: gldebugger-tests Bundle-SymbolicName: com.android.ide.eclipse.gldebugger.tests -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit4;bundle-version="4.5.0", com.android.ide.eclipse.gldebugger, diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF index fcaceb7..e3ca918 100644 --- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLESv2 Debugger Client Bundle-SymbolicName: com.android.ide.eclipse.gldebugger;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.gldebugger.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF index 20c6f82..14a302f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Hierarchy Viewer Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.hierarchyviewer.HierarchyViewerPlugin Bundle-Vendor: The Android Open Source Project Bundle-Localization: plugin diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF index fc401eb..a25e411 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.android.ide.eclipse.monitor;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.monitor.MonitorPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF index ec28288..28d4863 100644 --- a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pdt Bundle-SymbolicName: com.android.ide.eclipse.pdt;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, 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 905fd83..6fc1ed7 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 @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Android Plugin Tests Bundle-SymbolicName: com.android.ide.eclipse.tests -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Vendor: The Android Open Source Project -Fragment-Host: com.android.ide.eclipse.adt;bundle-version="16.0.0" +Fragment-Host: com.android.ide.eclipse.adt;bundle-version="17.0.0" Require-Bundle: org.junit Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: kxml2-2.3.0.jar, diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF index dd8007b..a62dc10 100644 --- a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Traceview Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true -Bundle-Version: 16.0.0.qualifier +Bundle-Version: 17.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.traceview.TraceviewPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.ui.ide, - com.android.ide.eclipse.ddms;bundle-version="16.0.0", + com.android.ide.eclipse.ddms;bundle-version="17.0.0", org.eclipse.core.filesystem, org.eclipse.core.resources Bundle-ActivationPolicy: lazy diff --git a/eclipse/scripts/update_version.sh b/eclipse/scripts/update_version.sh index c73407a..6e7a7fc 100755 --- a/eclipse/scripts/update_version.sh +++ b/eclipse/scripts/update_version.sh @@ -28,10 +28,10 @@ NEW="${NEW//./\.}\.qualifier" # Now find the same files but this time use sed to replace in-place with # the new pattern. Old files get backuped with the .old extension. -grep -rl "$OLD" * | grep -E "\.xml$|\.MF$" | xargs -n 1 sed -i -e "s/$OLD/$NEW/g" +grep -rl "$OLD" * | grep -E "\.xml$|\.MF$" | xargs -n 1 sed -i "" "s/$OLD/$NEW/g" # do another grep for older version without the qualifier. We don't # want to replace those automatically as it could be something else. # Printing out occurence helps find ones to update manually. -grep -rl "$REALOLD" * +grep -r "$REALOLD" * diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml index 483d470..cb3cd5a 100644 --- a/eclipse/sites/external/site.xml +++ b/eclipse/sites/external/site.xml @@ -3,16 +3,16 @@ <description url="https://dl-ssl.google.com/android/eclipse/"> Update Site for Android Development Toolkit </description> - <feature url="features/com.android.ide.eclipse.adt_16.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_17.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="17.0.0.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_16.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_17.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="17.0.0.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_16.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_17.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="17.0.0.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_16.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_17.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="17.0.0.qualifier"> <category name="developer"/> </feature> <category-def name="developer" label="Developer Tools"> diff --git a/eclipse/sites/internal/site.xml b/eclipse/sites/internal/site.xml index 7ddeea4..4661ec4 100644 --- a/eclipse/sites/internal/site.xml +++ b/eclipse/sites/internal/site.xml @@ -3,28 +3,28 @@ <description url="https://android.corp.google.com/adt/"> Update Site for Android Development Toolkit </description> - <feature url="features/com.android.ide.eclipse.adt_16.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_17.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="17.0.0.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_16.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_17.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="17.0.0.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_16.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_17.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="17.0.0.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.tests_16.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.tests_17.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="17.0.0.qualifier"> <category name="test"/> </feature> - <feature url="features/com.android.ide.eclipse.pdt_16.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.pdt_17.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="17.0.0.qualifier"> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_16.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_17.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="17.0.0.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.gldebugger_16.0.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="16.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.gldebugger_17.0.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="17.0.0.qualifier"> <category name="developer"/> </feature> <category-def name="developer" label="Application Developer Tools"> diff --git a/files/plugin.prop b/files/plugin.prop index 6d33581..5bafefa 100644 --- a/files/plugin.prop +++ b/files/plugin.prop @@ -1,3 +1,3 @@ # begin plugin.prop -plugin.version=14.0.0 +plugin.version=17.0.0 # end plugin.prop
\ No newline at end of file diff --git a/files/tools_source.properties b/files/tools_source.properties index 7545316..f43d1e3 100644 --- a/files/tools_source.properties +++ b/files/tools_source.properties @@ -1,3 +1,3 @@ Pkg.UserSrc=false -Pkg.Revision=16 -Platform.MinPlatformToolsRev=9 +Pkg.Revision=17 +Platform.MinPlatformToolsRev=11 |