Skip to content

Instantly share code, notes, and snippets.

@fxthomas
Created May 17, 2013 14:48
Show Gist options
  • Save fxthomas/5599529 to your computer and use it in GitHub Desktop.
Save fxthomas/5599529 to your computer and use it in GitHub Desktop.
Android patch for IntelliJ projects generated by sbtidea
diff -rupN original/.idea/modules.xml modified/.idea/modules.xml
--- original/.idea/modules.xml 2013-05-17 16:27:19.000000000 +0200
+++ modified/.idea/modules.xml 2013-05-17 16:41:26.000000000 +0200
@@ -1,9 +1,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/.idea_modules/main-build.iml" filepath="$PROJECT_DIR$/.idea_modules/main-build.iml" ></module>
<module fileurl="file://$PROJECT_DIR$/.idea_modules/main.iml" filepath="$PROJECT_DIR$/.idea_modules/main.iml" ></module>
- <module fileurl="file://$PROJECT_DIR$/.idea_modules/tests.iml" filepath="$PROJECT_DIR$/.idea_modules/tests.iml" ></module>
</modules>
</component>
-</project>
\ No newline at end of file
+</project>
diff -rupN original/.idea_modules/main.iml modified/.idea_modules/main.iml
--- original/.idea_modules/main.iml 2013-05-17 16:27:19.000000000 +0200
+++ modified/.idea_modules/main.iml 2013-05-17 16:41:26.000000000 +0200
@@ -9,6 +9,18 @@
<option name="compilerOptions" value=""></option>
</configuration>
</facet>
+ <facet type="android" name="Android">
+ <configuration>
+ <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/../target/scala-2.10/src_managed/main/java" />
+ <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/../target/scala-2.10/src_managed/main/java" />
+ <option name="RES_FOLDER_RELATIVE_PATH" value="/../src/main/res" />
+ <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/../src/main/assets" />
+ <option name="LIBS_FOLDER_RELATIVE_PATH" value="/../src/main/libs" />
+ <option name="RUN_PROGUARD" value="true" />
+ <option name="PROGUARD_CFG_PATH" value="/proguard.txt" />
+ <includeSystemProguardFile>false</includeSystemProguardFile>
+ </configuration>
+ </facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../target/scala-2.10/classes"></output>
@@ -30,10 +42,9 @@
<excludeFolder url="file://$MODULE_DIR$/../target/streams"></excludeFolder>
<excludeFolder url="file://$MODULE_DIR$/../target/scala-2.10/test-classes"></excludeFolder>
</content>
- <orderEntry type="inheritedJdk"></orderEntry>
+ <orderEntry type="jdk" jdkName="Android SDK" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false"></orderEntry>
<orderEntry level="project" name="SBT: org.scala-lang:scala-library:2.10.1" type="library"></orderEntry>
<orderEntry level="project" name="SBT: org.scaloid:scaloid:1.1_8_2.10" type="library"></orderEntry>
- <orderEntry level="project" name="android.jar" type="library"></orderEntry>
</component>
-</module>
\ No newline at end of file
+</module>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment