Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove dep on logback #422

Merged
merged 1 commit into from
Oct 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<stringAttribute key="featurePluginResolution" value="workspace"/>
<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="location" value="${workspace_loc}/../runtime-jdtls"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="CLIENT_HOST" value="127.0.0.1"/>
<mapEntry key="CLIENT_PORT" value="5036"/>
Expand All @@ -30,7 +31,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Zulu 11 [sfdc-11.0.9.1-zulu11.43.56-sa]"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JRE [17.0.4]"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx2048m -Declipse.log.size.max=3000"/>
Expand Down Expand Up @@ -115,10 +116,8 @@
<setEntry value="org.slf4j.api@default:default"/>
</setAttribute>
<setAttribute key="selected_workspace_bundles">
<setEntry value="com.salesforce.b2eclipse.jdt.ls@default:default"/>
<setEntry value="com.salesforce.bazel-java-sdk@default:default"/>
<setEntry value="com.salesforce.bazel.eclipse.common@default:default"/>
<setEntry value="org.eclipse.jdt.ls.core@default:default"/>
</setAttribute>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;

import com.salesforce.bazel.sdk.index.CodeIndex;
import com.salesforce.bazel.sdk.index.CodeIndexEntry;
import com.salesforce.bazel.sdk.index.jvm.jar.JarIdentiferResolver;
import com.salesforce.bazel.sdk.index.jvm.jar.JavaJarCrawler;
import com.salesforce.bazel.sdk.lang.jvm.external.BazelExternalJarRuleManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.io.File;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ Require-Bundle: org.eclipse.ui.console;bundle-version="3.8.100.v20180821-1744",
org.eclipse.core.expressions;bundle-version="3.6.200.v20180817-1401",
com.salesforce.bazel-java-sdk;bundle-version="1.5.2.qualifier",
org.slf4j.api;bundle-version="1.7.30",
ch.qos.logback.core;bundle-version="1.2.3",
ch.qos.logback.classic;bundle-version="1.2.3",
com.salesforce.bazel.eclipse.common,
org.eclipse.ltk.core.refactoring
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import org.eclipse.jdt.launching.sourcelookup.containers.JavaProjectSourceContainer;
import org.eclipse.jdt.launching.sourcelookup.containers.JavaSourceLookupParticipant;

import com.salesforce.bazel.eclipse.BazelPluginActivator;
import com.salesforce.bazel.eclipse.component.ComponentContext;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorPart;

import com.salesforce.bazel.eclipse.BazelPluginActivator;
import com.salesforce.bazel.eclipse.component.ComponentContext;
import com.salesforce.bazel.sdk.aspect.AspectTargetInfo;
import com.salesforce.bazel.sdk.aspect.jvm.JVMAspectTargetInfo;
Expand Down
11 changes: 7 additions & 4 deletions docs/dev/dev_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,16 @@ At this point you almost certainly have multiple *Eclipse IDE* versions installe
Therefore you want to be very intentional about how you launch the Eclipse SDK.
Do not rely on your OS finder to launch "Eclipse", as it might not be the PDE one.

As a best practice, write a simple launcher script named *eclipse_sdk.sh*
As a best practice, use the simple launcher script named *eclipse_sdk.sh*.
You will need to create your own ```my_env.sh``` file
(it is [.gitignore](../../.gitignore)'d already)
in the root directory of this repository on your local machine.
It will look something like:

```
# launch the Eclipse SDK
/Users/mbenioff/tools/eclipse/sdk49/Eclipse.app/Contents/MacOS/eclipse &
export JAVA_HOME=/Users/mbenioff/dev/jdk/openjdk_17
export ECLIPSE_DIR=/Users/mbenioff/dev/eclipse/SDK/4.25

```

### Import the bazel-eclipse projects into the Eclipse SDK
Expand All @@ -75,7 +77,8 @@ There will be errors. This is expected at this point.

- Click *Window* -> *Perspective* -> *Open Perspective* -> *Plug-in Development*
- Open file *releng/target-platform/target-platform.target* file
- Click *Reload Target Platform* in the upper right. This will run for a **long** time (20 minutes perhaps).
- Click the *Set as Active Target Platform* link in the upper right
- Click *Reload Target Platform* in the upper right. This will run for a **long** time (5 minutes perhaps).
- The Problems view should now be free of errors

:fire: if you see errors or warnings at this point, see the [dev issues page](dev_issues.md) for help.
Expand Down
2 changes: 0 additions & 2 deletions features/com.salesforce.bazel.eclipse.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@
<import plugin="org.eclipse.core.expressions" version="3.6.200.v20180817-1401" match="greaterOrEqual"/>
<import plugin="com.salesforce.bazel-java-sdk" version="1.5.2" match="greaterOrEqual"/>
<import plugin="org.slf4j.api" version="1.7.30" match="greaterOrEqual"/>
<import plugin="ch.qos.logback.core" version="1.2.3" match="greaterOrEqual"/>
<import plugin="ch.qos.logback.classic" version="1.2.3" match="greaterOrEqual"/>
<import plugin="org.eclipse.ltk.core.refactoring"/>
<import plugin="org.apache.commons.lang3" version="3.1.0" match="greaterOrEqual"/>
</requires>
Expand Down