Brion VIBBER has submitted this change and it was merged. Change subject: Remove Machine specific IML files ......................................................................
Remove Machine specific IML files Change-Id: Icc59a5738f522f601e68dde6a080a5d4c37b0a85 GitHub: https://github.com/wikimedia/apps-android-commons/pull/17 --- D commons-parent.iml D commons/commons.iml 2 files changed, 0 insertions(+), 58 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/commons-parent.iml b/commons-parent.iml deleted file mode 100644 index 87e527b..0000000 --- a/commons-parent.iml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <excludeFolder url="file://$MODULE_DIR$/target" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - </component> -</module> - diff --git a/commons/commons.iml b/commons/commons.iml deleted file mode 100644 index 1243a35..0000000 --- a/commons/commons.iml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="FacetManager"> - <facet type="android" name="Android"> - <configuration> - <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/target/generated-sources/r" /> - <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/target/generated-sources/aidl" /> - <option name="LIBS_FOLDER_RELATIVE_PATH" value="/src/main/native" /> - <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/target/generated-sources/combined-resources/res" /> - <option name="APK_PATH" value="/target/commons.apk" /> - <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" /> - <includeAssetsFromLibraries>true</includeAssetsFromLibraries> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/idea-classes" /> - <output-test url="file://$MODULE_DIR$/target/idea-test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" /> - <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" /> - <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" /> - <excludeFolder url="file://$MODULE_DIR$/target/idea-classes" /> - </content> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="jdk" jdkName="Maven Android 4.2.2 Platform" jdkType="Android SDK" /> - <orderEntry type="library" name="Maven: org.mediawiki:api:1.3" level="project" /> - <orderEntry type="library" name="Maven: in.yuvi:http.fluent:1.3" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.2.2" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.2.2" level="project" /> - <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" /> - <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" /> - <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.2.2" level="project" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: android:android:4.1_r2" level="project" /> - <orderEntry type="library" name="Maven: android.support:compatibility-v4:11" level="project" /> - <orderEntry type="library" name="Maven: com.nostra13.universalimageloader:universal-image-loader:1.8.2" level="project" /> - <orderEntry type="library" name="Maven: ch.acra:acra:4.4.0" level="project" /> - <orderEntry type="library" name="Maven: de.keyboardsurfer.android.widget:crouton:1.7" level="project" /> - <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" /> - </component> -</module> - -- To view, visit https://gerrit.wikimedia.org/r/69311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc59a5738f522f601e68dde6a080a5d4c37b0a85 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/commons Gerrit-Branch: master Gerrit-Owner: SuchABot <yuvipanda+sucha...@gmail.com> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
