diff --git a/CHANGES.md b/CHANGES.md index 116b3493..f0c4b6ba 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,24 +1,38 @@ # Change Log -## 0.5-RC1 +## 0.5.1 + +This is a service release that fixes the following bugs: + +* [509683](https://bugs.eclipse.org/bugs/show_bug.cgi?id=509683) Andmore NDK plugin is missing an execution environment +* [509666](https://bugs.eclipse.org/bugs/show_bug.cgi?id=509666) NPE in visual editor causes load failures +* [509663](https://bugs.eclipse.org/bugs/show_bug.cgi?id=509663) Support for aapt --no-version-vectors option +* [484566](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484566) NPE in BaseBuilder.abortOnBadSetup +* [505930](https://bugs.eclipse.org/bugs/show_bug.cgi?id=505930) Exception While Linting + +## 0.5 + +See the notes for each 0.5 milestone below. + +### 0.5-RC1 This milestone signs the Andmore bundles with the certificate of the Eclipse Foundation. * [459574](https://bugs.eclipse.org/bugs/show_bug.cgi?id=459574) Migrate Build to use the CBI -## 0.5-M7 +### 0.5-M7 This milestone updates the embedded Android SDK to version 24.4.1. * [461942](https://bugs.eclipse.org/bugs/show_bug.cgi?id=461942) Update to latest Android SDK support libraries -## 0.5-M6 +### 0.5-M6 This milestone adds a field in the DDMS preference page for selecting the debug port. * [489253](https://bugs.eclipse.org/bugs/show_bug.cgi?id=489253) Add Preference Page Entry for Selected Debug Port -## 0.5-M5 +### 0.5-M5 This milestone fixes the Signing and Keys view and provides it as a separate installable feature on the update site. @@ -28,14 +42,14 @@ This milestone fixes the Signing and Keys view and provides it as a separate ins * [484667](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484667) Fix plugin and features vendor/provider name * [484689](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484689) Feature names to comply with Android trademark -## 0.5-M4 +### 0.5-M4 This milestone fixes a build error against the Eclipse Neon release. * [483020](https://bugs.eclipse.org/bugs/show_bug.cgi?id=483020) Build error against Neon * [484277](https://bugs.eclipse.org/bugs/show_bug.cgi?id=484277) Unify logo contributions to the About dialog -## 0.5-M3 +### 0.5-M3 This milestone introduces MultiDex support. The update site is improved to support correct installation of Andmore on Eclipse older then Luna. @@ -45,7 +59,7 @@ This milestone introduces MultiDex support. The update site is improved to suppo * [471469](https://bugs.eclipse.org/bugs/show_bug.cgi?id=471469) Add Profile to use released MARs artifacts as part of the build * [460132](https://bugs.eclipse.org/bugs/show_bug.cgi?id=460132) Fix license terms for dual licensed plugins -## 0.5-M2 +### 0.5-M2 Milestone two provides some stability and usability improvements. The biggest change is that the XML Editor no longer assumes it is the only editor. Also the Database Perspective and browser have been fixed to show all the icons in the tree. @@ -56,7 +70,7 @@ Also the Database Perspective and browser have been fixed to show all the icons * [471527](https://bugs.eclipse.org/bugs/show_bug.cgi?id=471527) Some wizards still open the Java perspective instead of the Android perspective * [468473](https://bugs.eclipse.org/bugs/show_bug.cgi?id=468473) Android Database Explorer throws NPE when expanding tree -## 0.5-M1 +### 0.5-M1 This is the first public stable build for the Andmore project. This release may have bugs and missing features but should be useable for most every day development. diff --git a/andmore-core/features/basic/feature.xml b/andmore-core/features/basic/feature.xml index f1a6eb9f..11dec3aa 100644 --- a/andmore-core/features/basic/feature.xml +++ b/andmore-core/features/basic/feature.xml @@ -2,7 +2,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/features/feature/feature.xml b/andmore-core/features/feature/feature.xml index c254d2f4..794af3dd 100644 --- a/andmore-core/features/feature/feature.xml +++ b/andmore-core/features/feature/feature.xml @@ -2,7 +2,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/features/sign/feature.xml b/andmore-core/features/sign/feature.xml index 294c68d9..3815d1f4 100644 --- a/andmore-core/features/sign/feature.xml +++ b/andmore-core/features/sign/feature.xml @@ -2,7 +2,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/android.codeutils/META-INF/MANIFEST.MF b/andmore-core/plugins/android.codeutils/META-INF/MANIFEST.MF index 562a47f4..78a866e9 100644 --- a/andmore-core/plugins/android.codeutils/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/android.codeutils/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.codeutils;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.codeutils.CodeUtilsActivator Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy diff --git a/andmore-core/plugins/android.codeutils/pom.xml b/andmore-core/plugins/android.codeutils/pom.xml index f4c69289..0f7d7a3b 100644 --- a/andmore-core/plugins/android.codeutils/pom.xml +++ b/andmore-core/plugins/android.codeutils/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/android.linux.x86/META-INF/MANIFEST.MF b/andmore-core/plugins/android.linux.x86/META-INF/MANIFEST.MF index 53ceb562..a07e708f 100644 --- a/andmore-core/plugins/android.linux.x86/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/android.linux.x86/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.linux.x86;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.andmore.android Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/andmore-core/plugins/android.linux.x86/pom.xml b/andmore-core/plugins/android.linux.x86/pom.xml index d2d96934..cb656cc6 100644 --- a/andmore-core/plugins/android.linux.x86/pom.xml +++ b/andmore-core/plugins/android.linux.x86/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/android.linux.x86_64/META-INF/MANIFEST.MF b/andmore-core/plugins/android.linux.x86_64/META-INF/MANIFEST.MF index 0882474a..d745fba0 100644 --- a/andmore-core/plugins/android.linux.x86_64/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/android.linux.x86_64/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.andmore.android.linux.x86_64;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.andmore.android Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/andmore-core/plugins/android.linux.x86_64/pom.xml b/andmore-core/plugins/android.linux.x86_64/pom.xml index 29faef09..f71745b7 100644 --- a/andmore-core/plugins/android.linux.x86_64/pom.xml +++ b/andmore-core/plugins/android.linux.x86_64/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/android.macosx/META-INF/MANIFEST.MF b/andmore-core/plugins/android.macosx/META-INF/MANIFEST.MF index de3b868a..99ca9a39 100644 --- a/andmore-core/plugins/android.macosx/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/android.macosx/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.macosx;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.andmore.android Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/andmore-core/plugins/android.macosx/pom.xml b/andmore-core/plugins/android.macosx/pom.xml index 1d3a84ba..52020e5d 100644 --- a/andmore-core/plugins/android.macosx/pom.xml +++ b/andmore-core/plugins/android.macosx/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/android.win32.x86/META-INF/MANIFEST.MF b/andmore-core/plugins/android.win32.x86/META-INF/MANIFEST.MF index 4bf878f2..06b170ab 100644 --- a/andmore-core/plugins/android.win32.x86/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/android.win32.x86/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.andmore.android.win32.x86;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.andmore.android Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/andmore-core/plugins/android.win32.x86/pom.xml b/andmore-core/plugins/android.win32.x86/pom.xml index 92d2b38f..51e52aff 100644 --- a/andmore-core/plugins/android.win32.x86/pom.xml +++ b/andmore-core/plugins/android.win32.x86/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/android.win32.x86_64/META-INF/MANIFEST.MF b/andmore-core/plugins/android.win32.x86_64/META-INF/MANIFEST.MF index cfe5300d..67b6da24 100644 --- a/andmore-core/plugins/android.win32.x86_64/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/android.win32.x86_64/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.andmore.android.win32.x86_64;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.andmore.android Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/andmore-core/plugins/android.win32.x86_64/pom.xml b/andmore-core/plugins/android.win32.x86_64/pom.xml index d0ad53ce..6c9e0375 100644 --- a/andmore-core/plugins/android.win32.x86_64/pom.xml +++ b/andmore-core/plugins/android.win32.x86_64/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/android/META-INF/MANIFEST.MF b/andmore-core/plugins/android/META-INF/MANIFEST.MF index a7ae6da0..a1292a6a 100644 --- a/andmore-core/plugins/android/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/android/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.AndroidPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/andmore-core/plugins/android/pom.xml b/andmore-core/plugins/android/pom.xml index f2b27a09..3c21d8a8 100644 --- a/andmore-core/plugins/android/pom.xml +++ b/andmore-core/plugins/android/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/certmanager/META-INF/MANIFEST.MF b/andmore-core/plugins/certmanager/META-INF/MANIFEST.MF index f39cb133..303dc196 100644 --- a/andmore-core/plugins/certmanager/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/certmanager/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.certmanager;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.certmanager.CertificateManagerActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/andmore-core/plugins/certmanager/pom.xml b/andmore-core/plugins/certmanager/pom.xml index 920da1a9..f52232ca 100644 --- a/andmore-core/plugins/certmanager/pom.xml +++ b/andmore-core/plugins/certmanager/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/common/META-INF/MANIFEST.MF b/andmore-core/plugins/common/META-INF/MANIFEST.MF index 013022c0..b747c78f 100644 --- a/andmore-core/plugins/common/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/common/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.common;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.common.CommonPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/andmore-core/plugins/common/pom.xml b/andmore-core/plugins/common/pom.xml index 56514b9f..156eb1eb 100644 --- a/andmore-core/plugins/common/pom.xml +++ b/andmore-core/plugins/common/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/db.core/META-INF/MANIFEST.MF b/andmore-core/plugins/db.core/META-INF/MANIFEST.MF index b97b6efb..502d742b 100644 --- a/andmore-core/plugins/db.core/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/db.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.db.core;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.db.core.DbCoreActivator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/andmore-core/plugins/db.core/pom.xml b/andmore-core/plugins/db.core/pom.xml index 37753576..3d64c51a 100644 --- a/andmore-core/plugins/db.core/pom.xml +++ b/andmore-core/plugins/db.core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/db.devices/META-INF/MANIFEST.MF b/andmore-core/plugins/db.devices/META-INF/MANIFEST.MF index 0fe0c2bf..c57dda6e 100644 --- a/andmore-core/plugins/db.devices/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/db.devices/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.db.devices;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.db.devices.DbDevicesPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/andmore-core/plugins/db.devices/pom.xml b/andmore-core/plugins/db.devices/pom.xml index fa757dfe..6684c510 100644 --- a/andmore-core/plugins/db.devices/pom.xml +++ b/andmore-core/plugins/db.devices/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/devices.services/META-INF/MANIFEST.MF b/andmore-core/plugins/devices.services/META-INF/MANIFEST.MF index 6151bb5c..8bd322fd 100644 --- a/andmore-core/plugins/devices.services/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/devices.services/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.devices.services;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.devices.services.DeviceServicesPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.andmore.android, diff --git a/andmore-core/plugins/devices.services/pom.xml b/andmore-core/plugins/devices.services/pom.xml index 5498aafa..cbbf86ad 100644 --- a/andmore-core/plugins/devices.services/pom.xml +++ b/andmore-core/plugins/devices.services/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/emulator/META-INF/MANIFEST.MF b/andmore-core/plugins/emulator/META-INF/MANIFEST.MF index b0d70e35..35932430 100644 --- a/andmore-core/plugins/emulator/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/emulator/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.emulator;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.emulator.EmulatorPlugin Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/andmore-core/plugins/emulator/pom.xml b/andmore-core/plugins/emulator/pom.xml index f77b7491..97a83487 100644 --- a/andmore-core/plugins/emulator/pom.xml +++ b/andmore-core/plugins/emulator/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/handset/META-INF/MANIFEST.MF b/andmore-core/plugins/handset/META-INF/MANIFEST.MF index 7572919f..ed954479 100644 --- a/andmore-core/plugins/handset/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/handset/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.handset;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.handset.HandsetPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.andmore.android, diff --git a/andmore-core/plugins/handset/pom.xml b/andmore-core/plugins/handset/pom.xml index 44b9058c..48ca432f 100644 --- a/andmore-core/plugins/handset/pom.xml +++ b/andmore-core/plugins/handset/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/installer/META-INF/MANIFEST.MF b/andmore-core/plugins/installer/META-INF/MANIFEST.MF index 011fe6c0..5f09a2a9 100644 --- a/andmore-core/plugins/installer/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/installer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.installer;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.installer.InstallerPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/andmore-core/plugins/installer/pom.xml b/andmore-core/plugins/installer/pom.xml index e9fc1214..4941646c 100644 --- a/andmore-core/plugins/installer/pom.xml +++ b/andmore-core/plugins/installer/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/launch/META-INF/MANIFEST.MF b/andmore-core/plugins/launch/META-INF/MANIFEST.MF index 237c56ee..c1296893 100644 --- a/andmore-core/plugins/launch/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/launch/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.launch;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.launch.LaunchPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.andmore.android, diff --git a/andmore-core/plugins/launch/pom.xml b/andmore-core/plugins/launch/pom.xml index d8a21bd4..4439f641 100644 --- a/andmore-core/plugins/launch/pom.xml +++ b/andmore-core/plugins/launch/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/logger.collector/META-INF/MANIFEST.MF b/andmore-core/plugins/logger.collector/META-INF/MANIFEST.MF index e6f725a2..5ba40c15 100644 --- a/andmore-core/plugins/logger.collector/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/logger.collector/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.logger.collector;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy diff --git a/andmore-core/plugins/logger.collector/pom.xml b/andmore-core/plugins/logger.collector/pom.xml index 3d5238e6..9a35fc61 100644 --- a/andmore-core/plugins/logger.collector/pom.xml +++ b/andmore-core/plugins/logger.collector/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/logger/META-INF/MANIFEST.MF b/andmore-core/plugins/logger/META-INF/MANIFEST.MF index e672e10a..3c9daabf 100644 --- a/andmore-core/plugins/logger/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/logger/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Andmore Android Logger Bundle-SymbolicName: org.eclipse.andmore.android.logger;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.logger.internal.Activator Bundle-Vendor: Eclipse Andmore Export-Package: org.eclipse.andmore.android.logger diff --git a/andmore-core/plugins/logger/pom.xml b/andmore-core/plugins/logger/pom.xml index 2c7b8997..b2fd2ad8 100644 --- a/andmore-core/plugins/logger/pom.xml +++ b/andmore-core/plugins/logger/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/mat/META-INF/MANIFEST.MF b/andmore-core/plugins/mat/META-INF/MANIFEST.MF index 8c936f52..94212246 100644 --- a/andmore-core/plugins/mat/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/mat/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.mat;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.mat.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/andmore-core/plugins/mat/pom.xml b/andmore-core/plugins/mat/pom.xml index 554e53b0..66f593e7 100644 --- a/andmore-core/plugins/mat/pom.xml +++ b/andmore-core/plugins/mat/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/packaging.ui/META-INF/MANIFEST.MF b/andmore-core/plugins/packaging.ui/META-INF/MANIFEST.MF index 212c1452..e28100ba 100644 --- a/andmore-core/plugins/packaging.ui/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/packaging.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.packaging.ui;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.packaging.ui.PackagingUIPlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.resources, diff --git a/andmore-core/plugins/packaging.ui/pom.xml b/andmore-core/plugins/packaging.ui/pom.xml index 7b8e2632..785d92a9 100644 --- a/andmore-core/plugins/packaging.ui/pom.xml +++ b/andmore-core/plugins/packaging.ui/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/remote.device/META-INF/MANIFEST.MF b/andmore-core/plugins/remote.device/META-INF/MANIFEST.MF index 2521be6a..c9c25f83 100644 --- a/andmore-core/plugins/remote.device/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/remote.device/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.remote;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.android.remote.RemoteDevicePlugin Bundle-Vendor: %providerName Require-Bundle: org.eclipse.ui, diff --git a/andmore-core/plugins/remote.device/pom.xml b/andmore-core/plugins/remote.device/pom.xml index b03ab5c7..9b0fa409 100644 --- a/andmore-core/plugins/remote.device/pom.xml +++ b/andmore-core/plugins/remote.device/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/snippets/META-INF/MANIFEST.MF b/andmore-core/plugins/snippets/META-INF/MANIFEST.MF index a11b281d..7c94471a 100644 --- a/andmore-core/plugins/snippets/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/snippets/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.codesnippets;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/andmore-core/plugins/snippets/pom.xml b/andmore-core/plugins/snippets/pom.xml index a8fd6436..915faa06 100644 --- a/andmore-core/plugins/snippets/pom.xml +++ b/andmore-core/plugins/snippets/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/plugins/translation/META-INF/MANIFEST.MF b/andmore-core/plugins/translation/META-INF/MANIFEST.MF index 5567ad75..c0cbc78c 100644 --- a/andmore-core/plugins/translation/META-INF/MANIFEST.MF +++ b/andmore-core/plugins/translation/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.android.translation;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.core.net, diff --git a/andmore-core/plugins/translation/pom.xml b/andmore-core/plugins/translation/pom.xml index 7b01ca1e..7de45075 100644 --- a/andmore-core/plugins/translation/pom.xml +++ b/andmore-core/plugins/translation/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT ../../ org.eclipse.andmore diff --git a/andmore-core/pom.xml b/andmore-core/pom.xml index c18e16a6..65f04305 100644 --- a/andmore-core/pom.xml +++ b/andmore-core/pom.xml @@ -5,12 +5,12 @@ org.eclipse.andmore andmore-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT pom diff --git a/andmore-core/site/pom.xml b/andmore-core/site/pom.xml index 537de917..72d48931 100644 --- a/andmore-core/site/pom.xml +++ b/andmore-core/site/pom.xml @@ -10,13 +10,13 @@ org.eclipse.andmore andmore-core - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT org.eclipse.andmore.repository eclipse-repository Andmore Repository - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/features/org.eclipse.andmore.ddms/feature.xml b/android-core/features/org.eclipse.andmore.ddms/feature.xml index 14b513dc..c9af5e75 100644 --- a/android-core/features/org.eclipse.andmore.ddms/feature.xml +++ b/android-core/features/org.eclipse.andmore.ddms/feature.xml @@ -2,7 +2,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/features/org.eclipse.andmore.gldebugger/feature.xml b/android-core/features/org.eclipse.andmore.gldebugger/feature.xml index e3409339..32c0dd2d 100644 --- a/android-core/features/org.eclipse.andmore.gldebugger/feature.xml +++ b/android-core/features/org.eclipse.andmore.gldebugger/feature.xml @@ -2,7 +2,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/features/org.eclipse.andmore.hierarchyviewer/feature.xml b/android-core/features/org.eclipse.andmore.hierarchyviewer/feature.xml index 7c0277d0..0d9db2c2 100644 --- a/android-core/features/org.eclipse.andmore.hierarchyviewer/feature.xml +++ b/android-core/features/org.eclipse.andmore.hierarchyviewer/feature.xml @@ -2,7 +2,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/features/org.eclipse.andmore.ndk/feature.xml b/android-core/features/org.eclipse.andmore.ndk/feature.xml index e5b6bb9d..d9df7229 100644 --- a/android-core/features/org.eclipse.andmore.ndk/feature.xml +++ b/android-core/features/org.eclipse.andmore.ndk/feature.xml @@ -2,7 +2,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/features/org.eclipse.andmore.package/feature.xml b/android-core/features/org.eclipse.andmore.package/feature.xml index cc4c21d5..81613a59 100644 --- a/android-core/features/org.eclipse.andmore.package/feature.xml +++ b/android-core/features/org.eclipse.andmore.package/feature.xml @@ -2,7 +2,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/features/org.eclipse.andmore.traceview/feature.xml b/android-core/features/org.eclipse.andmore.traceview/feature.xml index 68d69753..2935a074 100644 --- a/android-core/features/org.eclipse.andmore.traceview/feature.xml +++ b/android-core/features/org.eclipse.andmore.traceview/feature.xml @@ -2,7 +2,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/features/org.eclipse.andmore/feature.xml b/android-core/features/org.eclipse.andmore/feature.xml index 17e7622a..5d3bfabe 100644 --- a/android-core/features/org.eclipse.andmore/feature.xml +++ b/android-core/features/org.eclipse.andmore/feature.xml @@ -2,7 +2,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.base/.classpath b/android-core/plugins/org.eclipse.andmore.base/.classpath index f1327927..62c0fbc5 100644 --- a/android-core/plugins/org.eclipse.andmore.base/.classpath +++ b/android-core/plugins/org.eclipse.andmore.base/.classpath @@ -13,6 +13,5 @@ - diff --git a/android-core/plugins/org.eclipse.andmore.base/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.base/META-INF/MANIFEST.MF index 2bccf587..831ffadc 100644 --- a/android-core/plugins/org.eclipse.andmore.base/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.base/META-INF/MANIFEST.MF @@ -2,14 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Common Android Utilities Bundle-SymbolicName: org.eclipse.andmore.base;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.apache.httpcomponents.httpclient;bundle-version="4.1.3", org.apache.httpcomponents.httpcore;bundle-version="4.1.4", org.apache.commons.logging;bundle-version="1.1.1", org.apache.commons.codec;bundle-version="1.4.0", - org.apache.commons.compress;bundle-version="1.6.0" + org.apache.commons.compress;bundle-version="1.6.0", + com.google.gson;bundle-version="2.2.4" Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Andmore Bundle-ClassPath: ., @@ -22,8 +23,7 @@ Bundle-ClassPath: ., libs/sdklib.jar, libs/sdkstats.jar, libs/dvlib.jar, - libs/sdk-common.jar, - libs/gson-2.2.4.jar + libs/sdk-common.jar Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: com.android, com.android.annotations, diff --git a/android-core/plugins/org.eclipse.andmore.base/libs/gson-2.2.4.jar b/android-core/plugins/org.eclipse.andmore.base/libs/gson-2.2.4.jar deleted file mode 100644 index 75fe27c5..00000000 Binary files a/android-core/plugins/org.eclipse.andmore.base/libs/gson-2.2.4.jar and /dev/null differ diff --git a/android-core/plugins/org.eclipse.andmore.base/pom.xml b/android-core/plugins/org.eclipse.andmore.base/pom.xml index 55f78150..1470d7c4 100644 --- a/android-core/plugins/org.eclipse.andmore.base/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.base/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.ddms/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.ddms/META-INF/MANIFEST.MF index 6803e7fb..71c61547 100644 --- a/android-core/plugins/org.eclipse.andmore.ddms/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.ddms/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.andmore.ddms;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.ddms.DdmsPlugin Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/android-core/plugins/org.eclipse.andmore.ddms/pom.xml b/android-core/plugins/org.eclipse.andmore.ddms/pom.xml index abd05093..9a6bd79c 100644 --- a/android-core/plugins/org.eclipse.andmore.ddms/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.ddms/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.gldebugger/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.gldebugger/META-INF/MANIFEST.MF index 5c42cb33..3f1dd557 100644 --- a/android-core/plugins/org.eclipse.andmore.gldebugger/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.gldebugger/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tracer for OpenGL ES Bundle-SymbolicName: org.eclipse.andmore.gldebugger;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.gltrace.GlTracePlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/android-core/plugins/org.eclipse.andmore.gldebugger/pom.xml b/android-core/plugins/org.eclipse.andmore.gldebugger/pom.xml index e91dc8db..b8949e25 100644 --- a/android-core/plugins/org.eclipse.andmore.gldebugger/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.gldebugger/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.hierarchyviewer/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.hierarchyviewer/META-INF/MANIFEST.MF index 7d1d1f39..1e0b6140 100644 --- a/android-core/plugins/org.eclipse.andmore.hierarchyviewer/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.hierarchyviewer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.andmore.hierarchyviewer;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.hierarchyviewer.HierarchyViewerPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/android-core/plugins/org.eclipse.andmore.hierarchyviewer/pom.xml b/android-core/plugins/org.eclipse.andmore.hierarchyviewer/pom.xml index 3a758c18..6b6010f5 100644 --- a/android-core/plugins/org.eclipse.andmore.hierarchyviewer/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.hierarchyviewer/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.integration.tests/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.integration.tests/META-INF/MANIFEST.MF index b0332687..3cc10147 100644 --- a/android-core/plugins/org.eclipse.andmore.integration.tests/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.integration.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Android Plugin Tests Bundle-SymbolicName: org.eclipse.andmore.integration.tests -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: Eclipse Andmore Fragment-Host: org.eclipse.andmore Require-Bundle: org.junit, diff --git a/android-core/plugins/org.eclipse.andmore.integration.tests/pom.xml b/android-core/plugins/org.eclipse.andmore.integration.tests/pom.xml index b5de4330..a5938090 100644 --- a/android-core/plugins/org.eclipse.andmore.integration.tests/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.integration.tests/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.integration.tests/unittests/org/eclipse/andmore/internal/editors/layout/configuration/LocaleTest.java b/android-core/plugins/org.eclipse.andmore.integration.tests/unittests/org/eclipse/andmore/internal/editors/layout/configuration/LocaleTest.java index 98c72519..3850ccae 100644 --- a/android-core/plugins/org.eclipse.andmore.integration.tests/unittests/org/eclipse/andmore/internal/editors/layout/configuration/LocaleTest.java +++ b/android-core/plugins/org.eclipse.andmore.integration.tests/unittests/org/eclipse/andmore/internal/editors/layout/configuration/LocaleTest.java @@ -31,8 +31,8 @@ public void test() { assertEquals(Locale.ANY, Locale.ANY); assertFalse(Locale.ANY.hasLanguage()); assertFalse(Locale.ANY.hasRegion()); - assertFalse(Locale.create(new LocaleQualifier()).hasLanguage()); - assertFalse(Locale.create(new LocaleQualifier()).hasRegion()); + assertFalse(Locale.create(new LocaleQualifier(LocaleQualifier.FAKE_VALUE)).hasLanguage()); + assertFalse(Locale.create(new LocaleQualifier(LocaleQualifier.FAKE_VALUE)).hasRegion()); assertEquals(Locale.create(new LocaleQualifier(language1)), Locale.create(new LocaleQualifier(language1))); assertTrue(Locale.create(new LocaleQualifier(language1)).hasLanguage()); @@ -48,7 +48,7 @@ public void test() { assertFalse(Locale.create(new LocaleQualifier(language1)).equals(Locale.create(new LocaleQualifier(null, language1, region1, null)))); assertFalse(Locale.create(new LocaleQualifier(language1)).equals(Locale.create(new LocaleQualifier(language2)))); assertFalse(Locale.create(new LocaleQualifier(null, language1, region1, null)).equals(Locale.create(new LocaleQualifier(null, language2, region1, null)))); - assertEquals("Locale{nb, __}", Locale.create(new LocaleQualifier(language1)).toString()); - assertEquals("Locale{nb, NO}", Locale.create(new LocaleQualifier(null, language1, region1, null)).toString()); + assertEquals("nb", Locale.create(new LocaleQualifier(language1)).toString()); + assertEquals("nb-rNO", Locale.create(new LocaleQualifier(null, language1, region1, null)).toString()); } } diff --git a/android-core/plugins/org.eclipse.andmore.ndk/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.ndk/META-INF/MANIFEST.MF index 642f96d8..8eb7ec10 100644 --- a/android-core/plugins/org.eclipse.andmore.ndk/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.ndk/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Native Development Tools for Android Bundle-SymbolicName: org.eclipse.andmore.ndk;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.ndk.internal.Activator Bundle-Vendor: Eclipse Andmore Require-Bundle: org.eclipse.core.runtime, @@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.andmore.ddms Bundle-ActivationPolicy: lazy Bundle-ClassPath: . +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/android-core/plugins/org.eclipse.andmore.ndk/pom.xml b/android-core/plugins/org.eclipse.andmore.ndk/pom.xml index 304b99dd..b2b4c550 100644 --- a/android-core/plugins/org.eclipse.andmore.ndk/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.ndk/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.overlay/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.overlay/META-INF/MANIFEST.MF index 03691ef4..99150b53 100644 --- a/android-core/plugins/org.eclipse.andmore.overlay/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.overlay/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT XML Overlay Bundle-SymbolicName: org.eclipse.andmore.overlay;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: Eclipse Andmore Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, diff --git a/android-core/plugins/org.eclipse.andmore.overlay/pom.xml b/android-core/plugins/org.eclipse.andmore.overlay/pom.xml index 0db82f69..f2decc86 100644 --- a/android-core/plugins/org.eclipse.andmore.overlay/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.overlay/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.package/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.package/META-INF/MANIFEST.MF index 858c4164..ba93ac6d 100644 --- a/android-core/plugins/org.eclipse.andmore.package/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.package/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.andmore.package;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-BundleShape: dir diff --git a/android-core/plugins/org.eclipse.andmore.package/pom.xml b/android-core/plugins/org.eclipse.andmore.package/pom.xml index 8b837edc..0f2438b1 100644 --- a/android-core/plugins/org.eclipse.andmore.package/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.package/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore.traceview/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore.traceview/META-INF/MANIFEST.MF index e53ae526..c4d147a1 100644 --- a/android-core/plugins/org.eclipse.andmore.traceview/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore.traceview/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Traceview for Android Bundle-SymbolicName: org.eclipse.andmore.traceview;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-Activator: org.eclipse.andmore.traceview.TraceviewPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/android-core/plugins/org.eclipse.andmore.traceview/pom.xml b/android-core/plugins/org.eclipse.andmore.traceview/pom.xml index bc7e5f56..75aa83f6 100644 --- a/android-core/plugins/org.eclipse.andmore.traceview/pom.xml +++ b/android-core/plugins/org.eclipse.andmore.traceview/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore/META-INF/MANIFEST.MF b/android-core/plugins/org.eclipse.andmore/META-INF/MANIFEST.MF index 7b22514a..dd3de481 100644 --- a/android-core/plugins/org.eclipse.andmore/META-INF/MANIFEST.MF +++ b/android-core/plugins/org.eclipse.andmore/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Core Development Tools for Android Bundle-SymbolicName: org.eclipse.andmore;singleton:=true -Bundle-Version: 0.5.0.qualifier +Bundle-Version: 0.5.1.qualifier Bundle-ClassPath: ., libs/sdkuilib.jar, libs/ninepatch.jar, @@ -50,6 +50,7 @@ Require-Bundle: org.eclipse.andmore.base, org.eclipse.core.expressions, org.eclipse.compare, org.eclipse.jdt.debug, + com.google.gson;bundle-version="2.2.4", org.objectweb.asm;bundle-version="[4.0.0,5.0.0)" Bundle-ActivationPolicy: lazy Export-Package: com.android.manifmerger;x-friends:="org.eclipse.andmore.integration.tests", diff --git a/android-core/plugins/org.eclipse.andmore/andmore.target b/android-core/plugins/org.eclipse.andmore/andmore.target index 0eca1b15..7f2d567f 100644 --- a/android-core/plugins/org.eclipse.andmore/andmore.target +++ b/android-core/plugins/org.eclipse.andmore/andmore.target @@ -2,26 +2,28 @@ - - - - - - - - - - + - + - - + + + + + + + + + + + + + - - + + @@ -34,14 +36,7 @@ - - - - - - - - + diff --git a/android-core/plugins/org.eclipse.andmore/icons/screenround.png b/android-core/plugins/org.eclipse.andmore/icons/screenround.png new file mode 100644 index 00000000..91e5690b Binary files /dev/null and b/android-core/plugins/org.eclipse.andmore/icons/screenround.png differ diff --git a/android-core/plugins/org.eclipse.andmore/pom.xml b/android-core/plugins/org.eclipse.andmore/pom.xml index 36fdcadc..74367c2e 100644 --- a/android-core/plugins/org.eclipse.andmore/pom.xml +++ b/android-core/plugins/org.eclipse.andmore/pom.xml @@ -11,7 +11,7 @@ ../../pom.xml org.eclipse.andmore andmore-core-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT diff --git a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/build/BuildHelper.java b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/build/BuildHelper.java index 853aa428..dec4409f 100644 --- a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/build/BuildHelper.java +++ b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/build/BuildHelper.java @@ -113,7 +113,7 @@ public class BuildHelper { private static final String MULTIDEX_ENABLED_PROPERTY = "multidex.enabled"; private static final String MULTIDEX_MAIN_DEX_LIST_PROPERTY = "multidex.main-dex-list"; - + @NonNull private final ProjectState mProjectState; @NonNull @@ -957,7 +957,9 @@ private void executeAapt(String aaptCommand, String osManifestPath, if (aaptCommand.equals(COMMAND_PACKAGE)) { commandArray.add("-f"); //$NON-NLS-1$ commandArray.add("--no-crunch"); //$NON-NLS-1$ - + if (mProjectState.isNoVersionVectors()) { + commandArray.add("--no-version-vectors"); //$NON-NLS-1$ + } // if more than one res, this means there's a library (or more) and we need // to activate the auto-add-overlay if (osResPaths.size() > 1) { diff --git a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/build/builders/BaseBuilder.java b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/build/builders/BaseBuilder.java index fabe9566..876d4b57 100644 --- a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/build/builders/BaseBuilder.java +++ b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/build/builders/BaseBuilder.java @@ -320,10 +320,16 @@ protected void abortOnBadSetup(@NonNull IJavaProject javaProject, if (projectState == null) { projectState = Sdk.getProjectState(javaProject.getProject()); } - + + // the project state can still be null, + // e.g. if there is no project.properties file + if (projectState == null) { + throw new AbortBuildException(); + } + // get the target for the project - IAndroidTarget target = projectState.getTarget(); - + IAndroidTarget target = projectState.getTarget(); + if (target == null) { throw new AbortBuildException(); } diff --git a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/editors/layout/configuration/ConfigurationMatcher.java b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/editors/layout/configuration/ConfigurationMatcher.java index 748cdaff..c647a08b 100644 --- a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/editors/layout/configuration/ConfigurationMatcher.java +++ b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/editors/layout/configuration/ConfigurationMatcher.java @@ -454,22 +454,25 @@ private int getLocaleMatch() { List localeList = mConfigChooser.getLocaleList(); final int count = localeList.size(); + // if no locale match the current local locale, it's likely that it is + // the default one which is the last one. + int bestMatch = count - 1; for (int l = 0; l < count; l++) { Locale locale = localeList.get(l); LocaleQualifier localeQ = locale.locale; - - // there's always a ##/Other or ##/Any (which is the same, the region - // contains FAKE_REGION_VALUE). If we don't find a perfect region match - // we take the fake region. Since it's last in the list, this makes the - // test easy. - if (localeQ.getLanguage().equals(currentLanguage) && (localeQ.getRegion().equals(currentRegion) || localeQ.hasRegion())) { - return l; + if (localeQ.getLanguage().equals(currentLanguage)) { + if (localeQ.hasRegion() && localeQ.getRegion().equals(currentRegion)) { + // there will be no better match + return l; + } else { + // this one is close, but maybe there is a complete match + bestMatch = l; + } } + } - // if no locale match the current local locale, it's likely that it is - // the default one which is the last one. - return count - 1; + return bestMatch; } return -1; diff --git a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/lint/EclipseLintClient.java b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/lint/EclipseLintClient.java index 1694a4dd..f885125e 100644 --- a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/lint/EclipseLintClient.java +++ b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/lint/EclipseLintClient.java @@ -294,17 +294,37 @@ public void dispose(@NonNull XmlContext context, @NonNull Document document) { } } - @Override - public Location getNameLocation(XmlContext arg0, Node arg1) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException(); - } - - @Override - public Location getValueLocation(XmlContext arg0, Attr arg1) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException(); - } + @Override + public Location getNameLocation(@NonNull XmlContext context, @NonNull Node node) { + IndexedRegion region = (IndexedRegion) node; + + IStructuredModel model = (IStructuredModel) context.getProperty(MODEL_PROPERTY); + // Get line number + LazyLocation location = new LazyLocation(context.file, + model.getStructuredDocument(), region); + int line = location.getStart().getLine(); + + Position startPos = new DefaultPosition(line, -1, region.getStartOffset()); + Position endPos = new DefaultPosition(line, -1, region.getEndOffset()); + + return Location.create(context.file, startPos, endPos); + } + + @Override + public Location getValueLocation(@NonNull XmlContext context, @NonNull Attr attribute) { + IndexedRegion region = (IndexedRegion) attribute; + + IStructuredModel model = (IStructuredModel) context.getProperty(MODEL_PROPERTY); + // Get line number + LazyLocation location = new LazyLocation(context.file, + model.getStructuredDocument(), region); + int line = location.getStart().getLine(); + + Position startPos = new DefaultPosition(line, -1, region.getStartOffset()); + Position endPos = new DefaultPosition(line, -1, region.getEndOffset()); + + return Location.create(context.file, startPos, endPos); + } }; } diff --git a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/properties/AndroidPropertyPage.java b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/properties/AndroidPropertyPage.java index 2a01caf2..2fd7cd07 100644 --- a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/properties/AndroidPropertyPage.java +++ b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/properties/AndroidPropertyPage.java @@ -50,6 +50,8 @@ public class AndroidPropertyPage extends PropertyPage { private IProject mProject; private SdkTargetSelector mSelector; private Button mIsLibrary; + private Button mNoVersionVectors; + // APK-SPLIT: This is not yet supported, so we hide the UI // private Button mSplitByDensity; private LibraryProperties mLibraryDependencies; @@ -89,6 +91,14 @@ protected Control createContents(Composite parent) { mIsLibrary = new Button(libraryGroup, SWT.CHECK); mIsLibrary.setText("Is Library"); + + Group optionsGroup = new Group(top, SWT.NONE); + optionsGroup.setLayoutData(new GridData(GridData.FILL_BOTH)); + optionsGroup.setLayout(new GridLayout(1, false)); + optionsGroup.setText("Other Options"); + + mNoVersionVectors = new Button(optionsGroup, SWT.CHECK); + mNoVersionVectors.setText("--no-version-vectors"); mLibraryDependencies = new LibraryProperties(libraryGroup); @@ -133,7 +143,11 @@ public boolean performOk() { Boolean.toString(mIsLibrary.getSelection())); mustSaveProp = true; } - + if (state == null || mNoVersionVectors.getSelection() != state.isNoVersionVectors()) { + mPropertiesWorkingCopy.setProperty(ProjectState.NO_VERSION_VECTORS_PROPERTY, + Boolean.toString(mNoVersionVectors.getSelection())); + mustSaveProp = true; + } if (mLibraryDependencies.save()) { mustSaveProp = true; } @@ -178,6 +192,7 @@ private void fillUi() { } mIsLibrary.setSelection(state.isLibrary()); + mNoVersionVectors.setSelection(state.isNoVersionVectors()); mLibraryDependencies.setContent(state, mPropertiesWorkingCopy); } diff --git a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/resources/ResourceHelper.java b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/resources/ResourceHelper.java index f571d2ae..57334ec1 100644 --- a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/resources/ResourceHelper.java +++ b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/resources/ResourceHelper.java @@ -100,6 +100,7 @@ import com.android.ide.common.resources.configuration.ScreenHeightQualifier; import com.android.ide.common.resources.configuration.ScreenOrientationQualifier; import com.android.ide.common.resources.configuration.ScreenRatioQualifier; +import com.android.ide.common.resources.configuration.ScreenRoundQualifier; import com.android.ide.common.resources.configuration.ScreenSizeQualifier; import com.android.ide.common.resources.configuration.ScreenWidthQualifier; import com.android.ide.common.resources.configuration.SmallestScreenWidthQualifier; @@ -143,6 +144,7 @@ public class ResourceHelper { sIconMap.put(VersionQualifier.class, factory.getIcon("version")); //$NON-NLS-1$ sIconMap.put(ScreenWidthQualifier.class, factory.getIcon("width")); //$NON-NLS-1$ sIconMap.put(ScreenHeightQualifier.class, factory.getIcon("height")); //$NON-NLS-1$ + sIconMap.put(ScreenRoundQualifier.class, factory.getIcon("screenround")); //$NON-NLS-1$ sIconMap.put(SmallestScreenWidthQualifier.class,factory.getIcon("swidth")); //$NON-NLS-1$ } catch (Throwable t) { AndmoreAndroidPlugin.log(t , null); diff --git a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/sdk/ProjectState.java b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/sdk/ProjectState.java index 3e95c634..64b52d24 100644 --- a/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/sdk/ProjectState.java +++ b/android-core/plugins/org.eclipse.andmore/src/org/eclipse/andmore/internal/sdk/ProjectState.java @@ -57,6 +57,14 @@ * */ public final class ProjectState { + + /** + * The name of the property to enable the --no-version-vectors aapt option + * when packaging the resources. This constant should propably rather go to + * ProjectProperties, but the library that contains it is not included + * in andmore as source code. + */ + public static final String NO_VERSION_VECTORS_PROPERTY = "no-version-vectors.enabled"; /** * A class that represents a library linked to a project. @@ -380,6 +388,17 @@ public boolean isLibrary() { String value = mProperties.getProperty(ProjectProperties.PROPERTY_LIBRARY); return value != null && Boolean.valueOf(value); } + + /** + * Determines whether aapt should use the --no-version-vectors + * option in addition to other command line parameters. + * + * @return True, if the corresponding project property is set to true. + */ + public boolean isNoVersionVectors() { + return Boolean.parseBoolean(mProperties.getProperty(NO_VERSION_VECTORS_PROPERTY)); + } + /** * Returns whether the project depends on one or more libraries. diff --git a/android-core/pom.xml b/android-core/pom.xml index 48a97cf0..00c9b3e8 100644 --- a/android-core/pom.xml +++ b/android-core/pom.xml @@ -6,7 +6,7 @@ org.eclipse.andmore andmore-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT org.eclipse.andmore diff --git a/pom.xml b/pom.xml index e3d614cd..556fab0d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.eclipse.andmore andmore-parent - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT Andmore Parent pom @@ -37,9 +37,9 @@ - 0.24.0 - http://download.eclipse.org/releases/mars/ - http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository + 0.26.0 + http://download.eclipse.org/releases/neon/ + http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository http://download.eclipse.org/sequoyah/updates/2.1/ http://download.eclipse.org/technology/m2e/releases/