Skip to content

Commit 57c729a

Browse files
electrolyteJelectrolyteJ
committed
u
1 parent 25d033e commit 57c729a

File tree

8 files changed

+54
-13
lines changed

8 files changed

+54
-13
lines changed

‎android/tools/module-assembler-intellij-plugin-2.1.0.zip‎

146 KB
Binary file not shown.

‎module-assembler-common/com/electrolytej/assembler/model/Module.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Module {
1818
public String format;
1919
public String versionName;
2020
public String versionCode;
21-
public String dynamic;
21+
// public String dynamic;
2222
public Type type = Type.NONE;
2323

2424
// public String binary_artifact;

‎module-assembler-gradle-plugin/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tasks.withType(GroovyCompile) {
1111
sourceCompatibility = '17'
1212
targetCompatibility = '17'
1313
}
14-
version = "1.1.0"
14+
version = "1.3.1"
1515
group ="io.github.electrolytej"
1616
gradlePlugin {
1717
vcsUrl = 'https://github.com/big-frontend/module-assembler.git'

‎module-assembler-gradle-plugin/src/main/groovy/AndroidPlugin.groovy‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ abstract class AndroidPlugin implements Plugin<Project> {
4848
}
4949
flavorDimensions "device"
5050
productFlavors {
51+
phone {
52+
dimension 'device'
53+
}
5154
tv {
5255
dimension 'device'
5356
}

‎module-assembler-gradle-plugin/src/main/groovy/ToolModulePlugin.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class ToolModulePlugin extends AndroidPlugin {
1010
@Override
1111
void onApply(Project project) {
1212
project.dependencies {
13-
implementation project.project(project.gradle.ext.appModule.sourcePath)
1413
if (routerLibrary) {
1514
api routerLibrary
1615
}

‎module-assembler-intellij-plugin/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
pluginGroup=com.electrolytej.moduleassembler
44
pluginName = module-assembler-intellij-plugin
55
# SemVer format -> https://semver.org
6-
pluginVersion = 2.0.0
6+
pluginVersion = 2.1.0
77
pluginRepositoryUrl = https://github.com/big-frontend/module-assembler
88

99

‎module-assembler-intellij-plugin/settings.gradle.kts‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
pluginManagement {
2+
repositories {
3+
maven(uri("$rootDir/repo"))
4+
mavenLocal()
5+
maven("https://s01.oss.sonatype.org/content/repositories/public/")
6+
maven("https://oss.sonatype.org/content/repositories/snapshots/")
7+
maven("https://maven.aliyun.com/repository/public")
8+
maven("https://maven.aliyun.com/repository/google/")
9+
maven("https://artifact.bytedance.com/repository/byteX/")
10+
maven("https://artifact.bytedance.com/repository/pangle")
11+
google()
12+
mavenCentral()
13+
gradlePluginPortal()
14+
// maven("https://plugins.gradle.org/m2/")
15+
maven("https://dl.bintray.com/kotlin/kotlin-eap")
16+
}
17+
}
18+
dependencyResolutionManagement {
19+
// repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
20+
repositories {
21+
maven(uri("$rootDir/repo"))
22+
mavenLocal()
23+
maven("https://s01.oss.sonatype.org/content/repositories/public/")
24+
maven("https://oss.sonatype.org/content/repositories/snapshots/")
25+
maven("https://maven.aliyun.com/repository/public")
26+
maven("https://jitpack.io")
27+
maven("https://artifact.bytedance.com/repository/byteX/")
28+
maven("https://artifact.bytedance.com/repository/pangle")
29+
//不能用
30+
// maven{
31+
// url = uri("http://repo.baichuan-android.taobao.com/content/groups/BaichuanRepositories/")
32+
// isAllowInsecureProtocol = true
33+
// }
34+
gradlePluginPortal()
35+
mavenCentral()
36+
google()
37+
}
38+
39+
}
140
plugins {
241
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
342
}

‎module-assembler-intellij-plugin/src/main/java/com/electrolytej/assembler/page/swingui/Dashboard.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void actionPerformed(ActionEvent e) {
138138
foreachModules((moduleNameJLabel, moduleStateComboBox) -> {
139139
Module module = binaryModuleMap.get(moduleNameJLabel.getText());
140140
if (module == null) module = excludeModuleMap.get(moduleNameJLabel.getText());
141-
if (module != null && !"fwk".equals(module.group) && module.dynamic == null) {
141+
if (module != null && !"fwk".equals(module.group) && !"ndbundle".equals(module.format)) {
142142
binaryModuleMap.remove(module.simpleName);
143143
excludeModuleMap.remove(module.simpleName);
144144
sourceModuleMap.put(module.simpleName, module);
@@ -151,7 +151,7 @@ public void actionPerformed(ActionEvent e) {
151151
foreachModules((moduleNameJLabel, moduleStateComboBox) -> {
152152
Module module = sourceModuleMap.get(moduleNameJLabel.getText());
153153
if (module == null) module = excludeModuleMap.get(moduleNameJLabel.getText());
154-
if (module != null && !"fwk".equals(module.group) && module.dynamic == null) {
154+
if (module != null && !"fwk".equals(module.group) && !"ndbundle".equals(module.format)) {
155155
sourceModuleMap.remove(module.simpleName);
156156
excludeModuleMap.remove(module.simpleName);
157157
binaryModuleMap.put(module.simpleName, module);
@@ -164,10 +164,10 @@ public void actionPerformed(ActionEvent e) {
164164
foreachModules((moduleNameJLabel, moduleStateComboBox) -> {
165165
Module module = sourceModuleMap.get(moduleNameJLabel.getText());
166166
if (module == null) module = binaryModuleMap.get(moduleNameJLabel.getText());
167-
if (module != null && !"fwk".equals(module.group) && module.dynamic == null) {
167+
if (module != null && !"fwk".equals(module.group)) {
168168
sourceModuleMap.remove(module.simpleName);
169169
binaryModuleMap.remove(module.simpleName);
170-
if ("main".equals(module.group)) {
170+
if ("main".equals(module.group) || "api".equals(module.format)) {
171171
moduleNameJLabel.setForeground(JBColor.ORANGE);
172172
moduleStateComboBox.setSelectedIndex(1);
173173
binaryModuleMap.put(module.simpleName, module);
@@ -187,7 +187,7 @@ public void actionPerformed(ActionEvent e) {
187187
foreachModules((moduleNameJLabel, moduleStateComboBox) -> {
188188
Module module = binaryModuleMap.get(moduleNameJLabel.getText());
189189
if (module == null) module = excludeModuleMap.get(moduleNameJLabel.getText());
190-
if (module != null && module.dynamic != null) {
190+
if (module != null && "ndbundle".equals(module.format)) {
191191
binaryModuleMap.remove(module.simpleName);
192192
excludeModuleMap.remove(module.simpleName);
193193
sourceModuleMap.put(module.simpleName, module);
@@ -200,7 +200,7 @@ public void actionPerformed(ActionEvent e) {
200200
foreachModules((moduleNameJLabel, moduleStateComboBox) -> {
201201
Module module = sourceModuleMap.get(moduleNameJLabel.getText());
202202
if (module == null) module = excludeModuleMap.get(moduleNameJLabel.getText());
203-
if (module != null && module.dynamic != null) {
203+
if (module != null && "ndbundle".equals(module.format)) {
204204
sourceModuleMap.remove(module.simpleName);
205205
excludeModuleMap.remove(module.simpleName);
206206
binaryModuleMap.put(module.simpleName, module);
@@ -214,7 +214,7 @@ public void actionPerformed(ActionEvent e) {
214214
foreachModules((moduleNameJLabel, moduleStateComboBox) -> {
215215
Module module = sourceModuleMap.get(moduleNameJLabel.getText());
216216
if (module == null) module = binaryModuleMap.get(moduleNameJLabel.getText());
217-
if (module != null && module.dynamic != null) {
217+
if (module != null && "ndbundle".equals(module.format)) {
218218
sourceModuleMap.remove(module.simpleName);
219219
binaryModuleMap.remove(module.simpleName);
220220
excludeModuleMap.put(module.simpleName, module);
@@ -334,9 +334,9 @@ private JPanel createFieldText(Module module, Color color, String defaultGroupNa
334334
jLabel.setForeground(color);
335335
jPanel.add(jLabel, bagConstraints);
336336
ComboBoxModel<String> comboBoxModel;
337-
if ("fwk".equalsIgnoreCase(module.group) || "main".equalsIgnoreCase(module.group)) {
337+
if ("fwk".equalsIgnoreCase(module.group) || "main".equalsIgnoreCase(module.group) || "api".equalsIgnoreCase(module.format)) {
338338
comboBoxModel = new CollectionComboBoxModel<>(Arrays.asList("source", "binary"));
339-
} else if ("plugin".equalsIgnoreCase(module.format)) {
339+
} else if ("ndbundle".equalsIgnoreCase(module.format)) {
340340
comboBoxModel = new CollectionComboBoxModel<>(Arrays.asList("source", "exclude"));
341341
} else {
342342
comboBoxModel = new CollectionComboBoxModel<>(Arrays.asList("source", "binary", "exclude"));

0 commit comments

Comments
 (0)