sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1730 from eclipse/cd_guice501

Browse source 
use guice 5.0.1
This commit is contained in:
Christian Dietrich 2021-08-16 09:27:26 +02:00 committed by GitHub
commit 87ac743c65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target vendored
View file

@ -21,7 +21,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target vendored
View file

@ -21,7 +21,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target vendored
View file

@ -21,7 +21,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target vendored
View file

@ -21,7 +21,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ11/mavenTychoJ11.parent/mavenTychoJ11.target/mavenTychoJ11.target.target vendored
View file

@ -20,7 +20,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>

2
org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target vendored
View file

@ -21,7 +21,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>

2
org.eclipse.xtext.util/META-INF/MANIFEST.MF
View file

@ -43,7 +43,7 @@ Export-Package: org.eclipse.xtext.util;
org.eclipse.xtext.xbase"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.20.0",
com.google.guava;bundle-version="[30.1.0,31.0.0)";visibility:=reexport,
com.google.inject;bundle-version="3.0.0";visibility:=reexport,
com.google.inject;bundle-version="5.0.1";visibility:=reexport,
javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
org.eclipse.xtend.lib
Import-Package: org.apache.log4j;version="1.2.15"

2
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file

@ -88,7 +88,7 @@ class TargetPlatformProject extends ProjectDescriptor {
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="com.google.inject" version="5.0.1.v20210324-2015"/>
<unit id="javax.inject" version="1.0.0.v20091030"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>

2
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file

@ -191,7 +191,7 @@ public class TargetPlatformProject extends ProjectDescriptor {
_builder.append("<unit id=\"com.google.gson\" version=\"2.8.7.v20210624-1215\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"com.google.inject\" version=\"3.0.0.v201605172100\"/>");
_builder.append("<unit id=\"com.google.inject\" version=\"5.0.1.v20210324-2015\"/>");
_builder.newLine();
_builder.append("\t\t\t");
_builder.append("<unit id=\"javax.inject\" version=\"1.0.0.v20091030\"/>");

2
org.eclipse.xtext/META-INF/MANIFEST.MF
View file

@ -193,7 +193,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0";visibility:=re
org.eclipse.emf.ecore;bundle-version="2.20.0";visibility:=reexport,
org.eclipse.emf.common;bundle-version="2.17.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport,
com.google.inject;bundle-version="3.0.0";visibility:=reexport,
com.google.inject;bundle-version="5.0.1";visibility:=reexport,
org.objectweb.asm;bundle-version="[9.1.0,9.2.0)";resolution:=optional,
org.eclipse.emf.mwe.core;bundle-version="1.3.21";resolution:=optional;visibility:=reexport,
org.eclipse.emf.mwe.utils;bundle-version="1.3.21";resolution:=optional;visibility:=reexport,

4
org.eclipse.xtext/src/org/eclipse/xtext/serializer/analysis/GrammarConstraintProvider.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015, 2016 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2021 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@ -53,10 +53,12 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
import com.google.inject.Singleton;
/**
* @author Moritz Eysholdt - Initial contribution and API
*/
@Singleton
public class GrammarConstraintProvider implements IGrammarConstraintProvider {
protected static class Constraint implements IGrammarConstraintProvider.IConstraint {

2
org.eclipse.xtext/src/org/eclipse/xtext/serializer/diagnostic/SequencerDiagnosticProvider.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2016 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2011, 2021 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.

7
org.eclipse.xtext/src/org/eclipse/xtext/serializer/impl/Serializer.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2020 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2011, 2021 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@ -8,6 +8,8 @@
*******************************************************************************/
package org.eclipse.xtext.serializer.impl;
import static com.google.common.base.Preconditions.*;
import java.io.IOException;
import java.io.Writer;
import java.util.Iterator;
@ -48,8 +50,7 @@ import org.eclipse.xtext.validation.IConcreteSyntaxValidator;
import com.google.common.base.CharMatcher;
import com.google.inject.Inject;
import com.google.inject.Provider;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.inject.Singleton;
/**
* @author Moritz Eysholdt - Initial contribution and API

2
org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/AssignmentFinder.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2021 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.

4
org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/ContextFinder.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2016 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2011, 2021 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
@ -42,12 +42,10 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.google.inject.Inject;
import com.google.inject.Singleton;
/**
* @author Moritz Eysholdt - Initial contribution and API
*/
@Singleton
public class ContextFinder implements IContextFinder {
@Inject

2
org.eclipse.xtext/src/org/eclipse/xtext/serializer/sequencer/IContextFinder.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2011, 2021 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.

7
org.eclipse.xtext/src/org/eclipse/xtext/service/DefaultRuntimeModule.java
View file

@ -82,7 +82,7 @@ public abstract class DefaultRuntimeModule extends AbstractGenericModule {
public void configure(Binder binder) {
super.configure(binder);
}
public EValidator.Registry bindEValidatorRegistry() {
return EValidator.Registry.INSTANCE;
}
@ -90,11 +90,11 @@ public abstract class DefaultRuntimeModule extends AbstractGenericModule {
public EPackage.Registry bindEPackageRegistry() {
return EPackage.Registry.INSTANCE;
}
public IResourceServiceProvider.Registry bindIResourceServiceProvider$Registry() {
return IResourceServiceProvider.Registry.INSTANCE;
}
@SingletonBinding
public Class<? extends Diagnostician> bindDiagnostician() {
return CancelableDiagnostician.class;
@ -256,4 +256,5 @@ public abstract class DefaultRuntimeModule extends AbstractGenericModule {
binder.bind(new TypeLiteral<ImmutableList<IsAffectedExtension>>() {}).toProvider(AllIsAffectedExtensions.class);
binder.bind(Key.get(IsAffectedExtension.class, Names.named("IsAffectedExtension.UniqueNames"))).to(INamesAreUniqueValidationHelper.ContextProvider.class);
}
}