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

maifest-merger converted to library

Browse Source
This commit is contained in:
Jens Ole Lauridsen
2018-02-26 18:38:48 +03:00
committed by Dmitry Avdeev
parent 6162163972
commit 83c0a539db
3 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
-1
View File
@@ -204,7 +204,6 @@
<module old-name="main_pycharm_ce" new-name="intellij.pycharm.community.main" />
<module old-name="main_pycharm_edu" new-name="intellij.pycharm.edu.main" />
<module old-name="manifest" new-name="intellij.java.manifest" />
<module old-name="manifest-merger" new-name="android.sdktools.manifest-merger" />
<module old-name="maven" new-name="intellij.maven" />
<module old-name="maven-artifact-resolver-common" new-name="intellij.maven.artifactResolver.common" />
<module old-name="maven-artifact-resolver-m2" new-name="intellij.maven.artifactResolver.m2" />
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+1
View File
@@ -36,6 +36,7 @@ class CommunityLibraryLicenses {
new LibraryLicense(name: "Android Layout Library", libraryName: "layoutlib", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Lint Checks", libraryName: "com.android.tools.lint:lint-checks:26.0.0", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Lint Api", libraryName: "com.android.tools.lint:lint-api:26.0.0", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Manifest Merger", libraryName: "com.android.tools.build:manifest-merger:26.0.0", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android DEX library", libraryName: "dexlib2", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Sherpa library", libraryName: "sherpa-solver", license: "Apache 2.0", url: "http://source.android.com/"),
new LibraryLicense(name: "Android Jimfs library", libraryName: "jimfs", license: "Apache 2.0", url: "https://github.com/google/jimfs"),
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
-1
View File
@@ -261,7 +261,6 @@ class CommunityRepositoryModules {
withModule("android.sdktools.sdk-common", "sdk-common.jar")
withModule("android.sdktools.layoutlib-api", "layoutlib-api.jar")
withModule("intellij.android.layoutlib", "layoutlib-loader.jar")
withModule("android.sdktools.manifest-merger", "manifest-merger.jar")
withModule("android.sdktools.chunkio", "pixelprobe.jar")
withModule("android.sdktools.pixelprobe", "pixelprobe.jar")