diff options
| author | Raphael Moll <ralf@android.com> | 2013-04-08 16:29:33 -0700 |
|---|---|---|
| committer | Raphael Moll <ralf@android.com> | 2013-04-08 16:29:33 -0700 |
| commit | 93ef19005bb8a3e8f8234451bb3306be3761c27f (patch) | |
| tree | 258e43f41494857c5f5303f20d9d5d50387003da /eclipse/plugins | |
| parent | 943e75754eebc492bc3280f4527cd221cfa2926d (diff) | |
| download | sdk-93ef19005bb8a3e8f8234451bb3306be3761c27f.zip sdk-93ef19005bb8a3e8f8234451bb3306be3761c27f.tar.gz sdk-93ef19005bb8a3e8f8234451bb3306be3761c27f.tar.bz2 | |
ADT: Fix version check.
The preview part of the Tools version check should be
ignored. Otherwise we'll get an error such as "ADT 22.0.0
can't use Tools 22.0.0 rc1" (because technically a preview
is lower than its final version.)
Change-Id: I2f91e1f2e2864d43518a23dfc2a9e45ae5d0f6af
Diffstat (limited to 'eclipse/plugins')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java index dfc2e33..6292cd6 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/VersionCheck.java @@ -23,6 +23,7 @@ import com.android.ide.eclipse.adt.AdtPlugin.CheckSdkErrorHandler.Solution; import com.android.ide.eclipse.adt.Messages; import com.android.sdklib.repository.FullRevision; import com.android.sdklib.repository.PkgProps; +import com.android.sdklib.repository.FullRevision.PreviewComparison; import org.osgi.framework.Constants; import org.osgi.framework.Version; @@ -164,7 +165,7 @@ public final class VersionCheck { } } - if (toolsRevision.compareTo(MIN_TOOLS_REV) < 0) { + if (toolsRevision.compareTo(MIN_TOOLS_REV, PreviewComparison.IGNORE) < 0) { // this is a warning only as we need to parse the SDK to allow updating // of the tools! return errorHandler.handleWarning( |