Skip to content

Commit 35ced1b

Browse files
LayoricLayoric
committed
Refactoring IDEA plugin separating Jetbrains OpenAPI code to reuse dialog and logic for eclipse.
1 parent 2d0aab1 commit 35ced1b

File tree

11 files changed

+302
-174
lines changed

11 files changed

+302
-174
lines changed

‎src/AndroidClient/AndroidClient.iml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7-
<option name="BUILDABLE" value="false" />
87
</configuration>
98
</facet>
109
</component>

‎src/AndroidClient/android/android.iml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.9" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.10" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,9 +12,8 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1615
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
16+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1817
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -63,7 +62,6 @@
6362
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6463
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6564
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6765
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6866
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6967
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -83,18 +81,18 @@
8381
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8482
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8583
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8784
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
8886
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
8987
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
9088
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9189
</content>
92-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
90+
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
9391
<orderEntry type="sourceFolder" forTests="false" />
94-
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9592
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
96-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
93+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9794
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
95+
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
9896
<orderEntry type="module" module-name="client" exported="" />
9997
</component>
10098
</module>

‎src/AndroidClient/app/app.iml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1615
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
16+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1817
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -86,12 +85,12 @@
8685
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8786
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8887
</content>
89-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
88+
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
9089
<orderEntry type="sourceFolder" forTests="false" />
91-
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9290
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
93-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
91+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9492
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
93+
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
9594
<orderEntry type="module" module-name="android" exported="" />
9695
</component>
9796
</module>

‎src/AndroidClient/client/client.iml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id=":client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.9" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":client" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="net.servicestack" external.system.module.version="1.0.10" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,9 +12,8 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1615
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
16+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1817
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -63,7 +62,6 @@
6362
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6463
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6564
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
66-
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6765
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6866
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6967
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -83,13 +81,10 @@
8381
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8482
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8583
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8784
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
9085
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9186
</content>
92-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
87+
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
9388
<orderEntry type="sourceFolder" forTests="false" />
9489
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9590
</component>

‎src/AndroidClient/techstacks/techstacks.iml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1615
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
16+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1817
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -82,16 +81,14 @@
8281
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8483
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
8784
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8885
</content>
89-
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
86+
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
9087
<orderEntry type="sourceFolder" forTests="false" />
91-
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9288
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
93-
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
89+
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
9490
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
91+
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
9592
<orderEntry type="module" module-name="android" exported="" />
9693
</component>
9794
</module>

0 commit comments

Comments
 (0)