directly depend on miglayout-swing and commons-codec libraries, no need to export it to all

2026-09-27 10:03:11 +07:00 · 2018-03-23 14:42:03 +01:00
parent e8cd47ca12
commit 85974a0491
20 changed files with 29 additions and 51 deletions
@@ -1,13 +1,14 @@
 <component name="libraryTable">
-  <library name="miglayout-swing">
+  <library name="miglayout-swing" type="repository">
+    <properties maven-id="com.miglayout:miglayout-swing:5.1" />
    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/miglayout-swing-5.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/miglayout-core-5.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/miglayout/miglayout-swing/5.1/miglayout-swing-5.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/miglayout/miglayout-core/5.1/miglayout-core-5.1.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/miglayout-core-5.0-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/src/miglayout-swing-5.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/miglayout/miglayout-swing/5.1/miglayout-swing-5.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/miglayout/miglayout-core/5.1/miglayout-core-5.1-sources.jar!/" />
    </SOURCES>
  </library>
 </component>
@@ -24,6 +24,7 @@
    <orderEntry type="module" module-name="intellij.platform.externalSystem" />
    <orderEntry type="library" name="gson" level="project" />
    <orderEntry type="library" name="jackson" level="project" />
+    <orderEntry type="library" name="miglayout-swing" level="project" />
  </component>
  <component name="copyright">
    <Base>
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2009 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.facet.impl.ui.libraries;

@@ -22,13 +8,13 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
-import org.apache.commons.codec.binary.Hex;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.List;

 /**
@@ -90,7 +76,7 @@ public class RequiredLibrariesInfo {
      md5.update(file.contentsToByteArray());
      final byte[] digest = md5.digest();

-      return new String(Hex.encodeHex(digest));
+      return Base64.getEncoder().encodeToString(digest);
    }
    catch (Exception e) {
      return null;
@@ -258,7 +258,7 @@ class CommunityLibraryLicenses {
                       licenseUrl: "https://github.com/willemv/mercurial_prompthooks/blob/master/LICENSE.txt"),
    new LibraryLicense(name: "Microba", libraryName: "microba", version: "0.4.2", license: "BSD", url: "http://microba.sourceforge.net/",
                       licenseUrl: "http://microba.sourceforge.net/license.txt"),
-    new LibraryLicense(name: "MigLayout", libraryName: "miglayout-swing", version: "5.0.0", license: "BSD", url: "http://www.miglayout.com/",
+    new LibraryLicense(name: "MigLayout", libraryName: "miglayout-swing", version: "5.1.0", license: "BSD", url: "http://www.miglayout.com/",
                       licenseUrl: "http://www.miglayout.com/mavensite/license.html"),
    new LibraryLicense(name: "minlog", libraryName: "minlog-1.2.jar", version: "1.2", license: "BSD",
                       url: "https://github.com/EsotericSoftware/minlog", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"),
@@ -22,5 +22,6 @@
    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
    <orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
+    <orderEntry type="library" name="miglayout-swing" level="project" />
  </component>
 </module>
@@ -32,5 +32,6 @@
    <orderEntry type="module" module-name="intellij.platform.builtInServer" />
    <orderEntry type="library" name="Groovy" level="project" />
    <orderEntry type="library" name="XStream" level="project" />
+    <orderEntry type="library" name="miglayout-swing" level="project" />
  </component>
 </module>
@@ -13,7 +13,7 @@
    <orderEntry type="library" name="Log4J" level="project" />
    <orderEntry type="module" module-name="intellij.platform.boot" />
    <orderEntry type="module" module-name="intellij.platform.bootstrap" />
-    <orderEntry type="library" exported="" name="commons-codec" level="project" />
+    <orderEntry type="library" name="commons-codec" level="project" />
    <orderEntry type="library" name="OroMatcher" level="project" />
    <orderEntry type="library" name="CGLIB" level="project" />
    <orderEntry type="module" module-name="intellij.platform.lvcs" exported="" />
@@ -23,7 +23,7 @@
    <orderEntry type="library" name="winp" level="project" />
    <orderEntry type="library" name="swingx" level="project" />
    <orderEntry type="module" module-name="intellij.platform.core.impl" exported="" />
-    <orderEntry type="library" exported="" name="miglayout-swing" level="project" />
+    <orderEntry type="library" name="miglayout-swing" level="project" />
    <orderEntry type="module" module-name="intellij.platform.indexing" />
    <orderEntry type="module" module-name="intellij.platform.indexing.impl" />
    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
@@ -38,5 +38,6 @@
    <orderEntry type="library" scope="TEST" name="jackson" level="project" />
    <orderEntry type="library" scope="TEST" name="snakeyaml" level="project" />
    <orderEntry type="library" name="jna" level="project" />
+    <orderEntry type="library" scope="TEST" name="miglayout-swing" level="project" />
  </component>
 </module>
@@ -22,5 +22,6 @@
    <orderEntry type="module" module-name="intellij.platform.diff.impl" exported="" />
    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
    <orderEntry type="library" name="swingx" level="project" />
+    <orderEntry type="library" name="miglayout-swing" level="project" />
  </component>
 </module>
@@ -26,5 +26,6 @@
    <orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
    <orderEntry type="module" module-name="intellij.platform.util" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
+    <orderEntry type="library" name="miglayout-swing" level="project" />
  </component>
 </module>
@@ -45,5 +45,6 @@
    <orderEntry type="module" module-name="intellij.platform.tasks.impl" />
    <orderEntry type="module" module-name="intellij.platform.tasks" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
+    <orderEntry type="library" name="commons-codec" level="project" />
  </component>
 </module>
@@ -23,5 +23,6 @@
    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
    <orderEntry type="module" module-name="intellij.platform.vcs.tests" scope="TEST" />
    <orderEntry type="library" scope="TEST" name="XStream" level="project" />
+    <orderEntry type="library" name="miglayout-swing" level="project" />
  </component>
 </module>
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2013 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 org.zmlx.hg4idea.repo;

 import com.intellij.dvcs.DvcsUtil;
@@ -25,7 +11,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.Hash;
 import com.intellij.vcs.log.VcsLogObjectsFactory;
-import org.apache.commons.codec.binary.Hex;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgNameWithHashInfo;
@@ -119,7 +104,7 @@ public class HgRepositoryReader {
  public String readCurrentRevision() {
    if (!isDirStateInfoAvailable()) return null;
    try {
-      return Hex.encodeHexString(readHashBytesFromFile(myDirStateFile));
+      return Base64.getEncoder().encodeToString(readHashBytesFromFile(myDirStateFile));
    }
    catch (IOException e) {
      // dirState exists if not fresh,  if we could not load dirState info repository must be corrupted
@@ -19,5 +19,6 @@
    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
    <orderEntry type="module" module-name="intellij.statsCollector.logEvents" />
+    <orderEntry type="library" name="commons-codec" level="project" />
  </component>
 </module>
@@ -1,9 +1,8 @@
-// Copyright 2000-2017 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.
+// 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.spellchecker.dictionary;


 import com.intellij.spellchecker.inspection.SpellcheckerInspectionTestCase;
-import com.intellij.util.containers.HashSet;

 import java.util.*;

@@ -29,7 +28,7 @@ public class AppDictionaryTest extends SpellcheckerInspectionTestCase {
  private static void doContainTest(String wordToCheck, Boolean expected) {
    assertEquals(expected, APP_DICTIONARY.contains(wordToCheck));
  }
-  
+
  public void testContainsProject() {
    doContainTest(BBBB);
  }
@@ -120,7 +119,7 @@ public class AppDictionaryTest extends SpellcheckerInspectionTestCase {
  public void testGetSuggestions(){
    final List<String> suggestions = new ArrayList<>();
    APP_DICTIONARY.getSuggestions("AAAB", suggestions::add);
-    assert suggestions.isEmpty(); // TODO: change current behavior 
+    assert suggestions.isEmpty(); // TODO: change current behavior
  }

  public void testNoSuggestions(){
@@ -1,9 +1,7 @@
-// Copyright 2000-2017 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.
+// 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.spellchecker.dictionary;

-
 import com.intellij.spellchecker.inspection.SpellcheckerInspectionTestCase;
-import com.intellij.util.containers.HashSet;

 import java.util.*;

@@ -31,7 +29,7 @@ public class ProjectDictionaryTest extends SpellcheckerInspectionTestCase {
  private static void doContainTest(String wordToCheck, Boolean expected) {
    assertEquals(expected, myProjectDictionary.contains(wordToCheck));
  }
-  
+
  public void testContainsProject() {
    doContainTest(BBBB);
  }
@@ -122,7 +120,7 @@ public class ProjectDictionaryTest extends SpellcheckerInspectionTestCase {
  public void testGetSuggestions(){
    final List<String> suggestions = new ArrayList<>();
    myProjectDictionary.getSuggestions("AAAB", suggestions::add);
-    assert suggestions.isEmpty(); // TODO: change current behavior 
+    assert suggestions.isEmpty(); // TODO: change current behavior
  }

  public void testNoSuggestions(){