diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-03 14:25:12 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-04 13:59:38 +0100 |
commit | 6dd42c72517d0ac07e8b684b4fa9bd79a0e12281 (patch) | |
tree | 1f135f126e0c4eb90e5981a7286303db6532bb02 | |
parent | f3478382007f8d463033f858dab070a48fdcf1d1 (diff) |
update android studio project files
-rw-r--r-- | android/sdremote/.gitignore | 6 | ||||
-rw-r--r-- | android/sdremote/.idea/compiler.xml | 18 | ||||
-rw-r--r-- | android/sdremote/.idea/gradle.xml | 7 | ||||
-rw-r--r-- | android/sdremote/.idea/jarRepositories.xml | 25 | ||||
-rw-r--r-- | android/sdremote/.idea/misc.xml | 2 | ||||
-rw-r--r-- | android/sdremote/.idea/modules.xml | 10 | ||||
-rw-r--r-- | android/sdremote/sdremote.iml | 5 |
7 files changed, 37 insertions, 36 deletions
diff --git a/android/sdremote/.gitignore b/android/sdremote/.gitignore index 9477344..5ea4d76 100644 --- a/android/sdremote/.gitignore +++ b/android/sdremote/.gitignore @@ -2,6 +2,9 @@ /**/build/ /local.properties /.idea/caches +/.idea/modules.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml /captures/ ## https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # user specifc @@ -10,5 +13,4 @@ # managed by gradle /.idea/libraries/ # build variants cause oscillation in the module imls.. -/mobile/mobile.iml -/wear/wear.iml +/.idea/**/*.iml diff --git a/android/sdremote/.idea/compiler.xml b/android/sdremote/.idea/compiler.xml index 96cc43e..61a9130 100644 --- a/android/sdremote/.idea/compiler.xml +++ b/android/sdremote/.idea/compiler.xml @@ -1,22 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="CompilerConfiguration"> - <resourceExtensions /> - <wildcardResourcePatterns> - <entry name="!?*.java" /> - <entry name="!?*.form" /> - <entry name="!?*.class" /> - <entry name="!?*.groovy" /> - <entry name="!?*.scala" /> - <entry name="!?*.flex" /> - <entry name="!?*.kt" /> - <entry name="!?*.clj" /> - <entry name="!?*.aj" /> - </wildcardResourcePatterns> - <annotationProcessing> - <profile default="true" name="Default" enabled="false"> - <processorPath useClasspath="true" /> - </profile> - </annotationProcessing> + <bytecodeTargetLevel target="1.8" /> </component> </project>
\ No newline at end of file diff --git a/android/sdremote/.idea/gradle.xml b/android/sdremote/.idea/gradle.xml index 1e31df1..ed02c33 100644 --- a/android/sdremote/.idea/gradle.xml +++ b/android/sdremote/.idea/gradle.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="GradleMigrationSettings" migrationVersion="1" /> <component name="GradleSettings"> <option name="linkedExternalProjectsSettings"> <GradleProjectSettings> - <compositeConfiguration> - <compositeBuild compositeDefinitionSource="SCRIPT" /> - </compositeConfiguration> + <option name="testRunner" value="PLATFORM" /> <option name="distributionType" value="LOCAL" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" /> @@ -17,7 +16,7 @@ </set> </option> <option name="resolveModulePerSourceSet" value="false" /> - <option name="testRunner" value="PLATFORM" /> + <option name="useQualifiedModuleNames" value="true" /> </GradleProjectSettings> </option> </component> diff --git a/android/sdremote/.idea/jarRepositories.xml b/android/sdremote/.idea/jarRepositories.xml new file mode 100644 index 0000000..e9f6564 --- /dev/null +++ b/android/sdremote/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RemoteRepositoriesConfiguration"> + <remote-repository> + <option name="id" value="central" /> + <option name="name" value="Maven Central repository" /> + <option name="url" value="https://repo1.maven.org/maven2" /> + </remote-repository> + <remote-repository> + <option name="id" value="jboss.community" /> + <option name="name" value="JBoss Community repository" /> + <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> + </remote-repository> + <remote-repository> + <option name="id" value="BintrayJCenter" /> + <option name="name" value="BintrayJCenter" /> + <option name="url" value="https://jcenter.bintray.com/" /> + </remote-repository> + <remote-repository> + <option name="id" value="Google" /> + <option name="name" value="Google" /> + <option name="url" value="https://maven.google.com/" /> + </remote-repository> + </component> +</project> diff --git a/android/sdremote/.idea/misc.xml b/android/sdremote/.idea/misc.xml index 973695b..46c9e97 100644 --- a/android/sdremote/.idea/misc.xml +++ b/android/sdremote/.idea/misc.xml @@ -27,5 +27,5 @@ </value> </option> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> </project>
\ No newline at end of file diff --git a/android/sdremote/.idea/modules.xml b/android/sdremote/.idea/modules.xml deleted file mode 100644 index 5df7e35..0000000 --- a/android/sdremote/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/mobile/mobile.iml" filepath="$PROJECT_DIR$/mobile/mobile.iml" /> - <module fileurl="file://$PROJECT_DIR$/sdremote.iml" filepath="$PROJECT_DIR$/sdremote.iml" /> - <module fileurl="file://$PROJECT_DIR$/wear/wear.iml" filepath="$PROJECT_DIR$/wear/wear.iml" /> - </modules> - </component> -</project>
\ No newline at end of file diff --git a/android/sdremote/sdremote.iml b/android/sdremote/sdremote.iml index 705da87..e846736 100644 --- a/android/sdremote/sdremote.iml +++ b/android/sdremote/sdremote.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.id="sdremote" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4"> +<module external.linked.project.id="sdremote" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="java-gradle" name="Java-Gradle"> <configuration> @@ -8,10 +8,11 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + <excludeFolder url="file://$MODULE_DIR$/build" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> |