MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

update guava to 26.0

Browse Source 
Not to 27.0 to ensure gradual upgrade
This commit is contained in:
Vladimir Krivosheev
2018-10-27 12:26:16 +02:00
parent 264ff1476c
commit 2bcb6060ee
5 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/Guava.xml
Generated
+3 -3
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="Guava" type="repository">
<properties include-transitive-deps="false" maven-id="com.google.guava:guava:25.1-jre" />
<properties include-transitive-deps="false" maven-id="com.google.guava:guava:26.0-jre" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/25.1-jre/guava-25.1-jre.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/26.0-jre/guava-26.0-jre.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/25.1-jre/guava-25.1-jre-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/26.0-jre/guava-26.0-jre-sources.jar!/" />
</SOURCES>
</library>
</component>
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+1 -1
View File
@@ -180,7 +180,7 @@ class CommunityLibraryLicenses {
new LibraryLicense(name: "Groovy", version: "2.4.6", license: "Apache 2.0", url: "http://groovy-lang.org/"),
new LibraryLicense(name: "Gson", version: "2.8.4", libraryName: "gson", license: "Apache 2.0",
url: "http://code.google.com/p/google-gson/"),
new LibraryLicense(name: "Guava", version: "23.6", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
new LibraryLicense(name: "Guava", version: "26.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
licenseUrl: "http://ant.apache.org/license.html"),
new LibraryLicense(name: "hamcrest", version: "1.3", license: "BSD", url: "http://hamcrest.org/",
licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"),
platform/script-debugger/debugger-ui/src/com/intellij/javascript/debugger/NameMapper.kt
+3 -17
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.javascript.debugger
import com.google.common.base.CharMatcher
@@ -28,9 +14,9 @@ import org.jetbrains.rpc.LOG
private val S1 = ",()[]{}="
// don't trim trailing .&: - could be part of expression
private val OPERATOR_TRIMMER = CharMatcher.INVISIBLE.or(CharMatcher.anyOf(S1))
private val OPERATOR_TRIMMER = CharMatcher.invisible().or(CharMatcher.anyOf(S1))
val NAME_TRIMMER: CharMatcher = CharMatcher.INVISIBLE.or(CharMatcher.anyOf(S1 + ".&:"))
val NAME_TRIMMER: CharMatcher = CharMatcher.invisible().or(CharMatcher.anyOf("$S1.&:"))
// generateVirtualFile only for debug purposes
open class NameMapper(private val document: Document, private val transpiledDocument: Document, private val sourceMappings: Mappings, protected val sourceMap: SourceMap, private val transpiledFile: VirtualFile? = null) {
python/src/com/jetbrains/python/console/PyConsoleUtil.java
+3 -17
View File
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.python.console;
import com.google.common.base.CharMatcher;
@@ -56,7 +42,7 @@ public class PyConsoleUtil {
private static final String IPYTHON_PAGING_PROMPT = "---Return to continue, q to quit---";
static final String[] PROMPTS = new String[]{
private static final String[] PROMPTS = new String[]{
ORDINARY_PROMPT,
INDENT_PROMPT,
HELP_PROMPT,
@@ -189,7 +175,7 @@ public class PyConsoleUtil {
Document document = editor.getDocument();
int lineStart = document.getLineStartOffset(document.getLineNumber(offset));
String textToCursor = document.getText(new TextRange(lineStart, offset));
e.getPresentation().setEnabled(!CharMatcher.WHITESPACE.matchesAllOf(textToCursor));
e.getPresentation().setEnabled(!CharMatcher.whitespace().matchesAllOf(textToCursor));
}
};
xml/impl/src/com/intellij/ide/browsers/StartBrowserSettings.java
+2 -1
View File
@@ -1,3 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ide.browsers;
import com.google.common.base.CharMatcher;
@@ -47,7 +48,7 @@ public class StartBrowserSettings {
public void setUrl(@Nullable String value) {
String normalized = StringUtil.nullize(value, true);
if (normalized != null) {
normalized = CharMatcher.WHITESPACE.trimFrom(normalized);
normalized = CharMatcher.whitespace().trimFrom(normalized);
}
myUrl = normalized;
}