Skip to content

Commit

Permalink
[Bug 526437] - Android SWT Libraries need to be forked
Browse files Browse the repository at this point in the history
Replaced sdkuilib module with one rewritten to work with Android API 25
libraries. This required bringing all of Andmore up to API 25 and hence
merged changes from separate branch for
https://bugs.eclipse.org/bugs/show_bug.cgi?id=525493

    Merged Matthew Piggott branch android-n.1 from
https://github.com/mpiggott/andmore.git. (next 5 changes)
    
    Updated Android SDK version to 25.3.3, lint libraries included.
    
    Modified android-core "adt" module for bug 525493 "Projects
containing aar libraries currently fail with robolectric 3.2.1"
    
    Replaced DexWrapper with JDT Java application launch.
    
    Removed legacy SWT jars
    
    Updated compile source and Java execution configuration settings
universally to JavaSE-1.8.
    
    Transferred ADT module IDE windows for SDK packages and devices to
sdkuilib. Note AdtUpdateDialog for installing individual packages is
incomplete, impacting new project and new installation wizards.
    
    Replaced all code for loading images to comply with Eclipse best
practice. In this process image files were relocated to dedicated bundle
directories.  

    Removed all jar files from distribution which are available online.
Maven now downloads them on "initialize" goal.
    
    Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=526437
    Signed-off-by: Andrew Bowley <andrewbowley@aapt.net.au>
  • Loading branch information
Kys3rK1ng committed Nov 23, 2017
1 parent ec019cc commit ac4ee26
Show file tree
Hide file tree
Showing 689 changed files with 60,165 additions and 110,868 deletions.
1 change: 0 additions & 1 deletion andmore-core/features/feature/feature.xml
Expand Up @@ -28,7 +28,6 @@
version="0.0.0"/>

<requires>
<import feature="org.eclipse.andmore.feature" version="0.0.0"/>
<import feature="org.eclipse.andmore.hierarchyviewer.feature" version="0.0.0"/>
<import feature="org.eclipse.andmore.ddms.feature" version="0.0.0"/>
<import feature="org.eclipse.andmore.traceview.feature" version="0.0.0"/>
Expand Down
14 changes: 7 additions & 7 deletions andmore-core/plugins/android.codeutils/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
68 changes: 34 additions & 34 deletions andmore-core/plugins/android.codeutils/META-INF/MANIFEST.MF
@@ -1,34 +1,34 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.andmore.android.codeutils;singleton:=true
Bundle-Version: 0.5.2.qualifier
Bundle-Activator: org.eclipse.andmore.android.codeutils.CodeUtilsActivator
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
Export-Package: org.eclipse.andmore.android.codeutils.codegeneration,
org.eclipse.andmore.android.codeutils.db.actions,
org.eclipse.andmore.android.codeutils.db.utils,
org.eclipse.andmore.android.codeutils.wizards,
org.eclipse.andmore.android.db.deployment,
org.eclipse.andmore.android.db.wizards.model,
org.eclipse.andmore.wizards.buildingblocks
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.datatools.connectivity,
org.eclipse.datatools.modelbase.sql,
org.eclipse.jdt.ui,
org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.andmore.android,
org.eclipse.andmore.android.common,
org.eclipse.jface.text,
org.eclipse.datatools.connectivity.sqm.core,
org.eclipse.jdt.core,
org.apache.xerces,
org.eclipse.datatools.sqltools.data.ui,
org.eclipse.sequoyah.localization.tools
Import-Package: org.eclipse.ui.texteditor
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.andmore.android.codeutils;singleton:=true
Bundle-Version: 0.5.2.qualifier
Bundle-Activator: org.eclipse.andmore.android.codeutils.CodeUtilsActivator
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Export-Package: org.eclipse.andmore.android.codeutils.codegeneration,
org.eclipse.andmore.android.codeutils.db.actions,
org.eclipse.andmore.android.codeutils.db.utils,
org.eclipse.andmore.android.codeutils.wizards,
org.eclipse.andmore.android.db.deployment,
org.eclipse.andmore.android.db.wizards.model,
org.eclipse.andmore.wizards.buildingblocks
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.datatools.connectivity,
org.eclipse.datatools.modelbase.sql,
org.eclipse.jdt.ui,
org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.andmore.android,
org.eclipse.andmore.android.common,
org.eclipse.jface.text,
org.eclipse.datatools.connectivity.sqm.core,
org.eclipse.jdt.core,
org.apache.xerces,
org.eclipse.datatools.sqltools.data.ui,
org.eclipse.sequoyah.localization.tools
Import-Package: org.eclipse.ui.texteditor
14 changes: 7 additions & 7 deletions andmore-core/plugins/android.win32.x86_64/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
20 changes: 10 additions & 10 deletions andmore-core/plugins/android.win32.x86_64/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
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.2.qualifier
Bundle-Vendor: %Bundle-Vendor
Fragment-Host: org.eclipse.andmore.android
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: fragment
Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
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.2.qualifier
Bundle-Vendor: %Bundle-Vendor
Fragment-Host: org.eclipse.andmore.android
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: fragment
Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
14 changes: 7 additions & 7 deletions andmore-core/plugins/android/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
94 changes: 48 additions & 46 deletions andmore-core/plugins/android/META-INF/MANIFEST.MF
@@ -1,46 +1,48 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.andmore.android;singleton:=true
Bundle-Version: 0.5.2.qualifier
Bundle-Activator: org.eclipse.andmore.android.AndroidPlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.andmore.android.common,
org.eclipse.andmore.android.logger.collector,
org.eclipse.core.runtime,
org.eclipse.core.filesystem,
org.eclipse.andmore,
org.eclipse.andmore.ddms,
org.eclipse.jdt.core,
org.eclipse.jface.text,
org.apache.xerces,
org.eclipse.ui.console,
org.eclipse.sequoyah.localization.tools,
org.eclipse.sequoyah.device.framework,
org.eclipse.sequoyah.device.common.utilities,
org.eclipse.debug.ui,
org.eclipse.core.expressions,
org.eclipse.andmore.base,
org.eclipse.jdt.ui,
org.apache.commons.net;bundle-version="1.4.1",
org.apache.oro;bundle-version="2.0.8"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
Export-Package:
org.eclipse.andmore.android,
org.eclipse.andmore.android.devices,
org.eclipse.andmore.android.i18n,
org.eclipse.andmore.android.model,
org.eclipse.andmore.android.multidex,
org.eclipse.andmore.android.nativeos,
org.eclipse.andmore.android.sdkmanager,
org.eclipse.andmore.android.utilities,
org.eclipse.andmore.android.wizards.elements,
org.eclipse.andmore.android.wizards.installapp,
org.eclipse.andmore.android.wizards.monkey
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.equinox.security.storage,
org.eclipse.ui.console
Bundle-ClassPath: .
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.andmore.android;singleton:=true
Bundle-Version: 0.5.2.qualifier
Bundle-Activator: org.eclipse.andmore.android.AndroidPlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.andmore.android.common,
org.eclipse.andmore.android.logger.collector,
org.eclipse.core.runtime,
org.eclipse.core.filesystem,
org.eclipse.andmore,
org.eclipse.andmore.ddms,
org.eclipse.jdt.core,
org.eclipse.jface.text,
org.apache.xerces,
org.eclipse.ui.console,
org.eclipse.sequoyah.localization.tools,
org.eclipse.sequoyah.device.framework,
org.eclipse.sequoyah.device.common.utilities,
org.eclipse.debug.ui,
org.eclipse.core.expressions,
org.eclipse.jdt.ui,
org.apache.commons.net;bundle-version="1.4.1",
org.apache.oro;bundle-version="2.0.8",
org.eclipse.andmore.swt;bundle-version="0.5.2",
org.eclipse.andmore.ddmuilib;bundle-version="0.5.2",
org.eclipse.andmore.sdkuilib;bundle-version="0.5.2"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Localization: plugin
Export-Package:
org.eclipse.andmore.android,
org.eclipse.andmore.android.devices,
org.eclipse.andmore.android.i18n,
org.eclipse.andmore.android.model,
org.eclipse.andmore.android.multidex,
org.eclipse.andmore.android.nativeos,
org.eclipse.andmore.android.sdkmanager,
org.eclipse.andmore.android.utilities,
org.eclipse.andmore.android.wizards.elements,
org.eclipse.andmore.android.wizards.installapp,
org.eclipse.andmore.android.wizards.monkey
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.equinox.security.storage,
org.eclipse.ui.console
Bundle-ClassPath: .

0 comments on commit ac4ee26

Please sign in to comment.