diff options
| author | Torsten Grote <t@grobox.de> | 2020-08-14 10:05:51 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-08-14 10:12:53 -0300 |
| commit | 2ac13b19a5c7fc3531447333fe1772a78ca35795 (patch) | |
| tree | d5579d87392a6a36d88deec4ceac777e68d6e8b8 /.idea | |
| parent | a35337b991f8b3d38c3480fb76acd9fc6df47885 (diff) | |
| download | wallet-kotlin-2ac13b19a5c7fc3531447333fe1772a78ca35795.tar.gz wallet-kotlin-2ac13b19a5c7fc3531447333fe1772a78ca35795.tar.bz2 wallet-kotlin-2ac13b19a5c7fc3531447333fe1772a78ca35795.zip | |
Add Taler common multiplatform library to project
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/.gitignore | 8 | ||||
| -rw-r--r-- | .idea/codeStyles/Project.xml | 5 | ||||
| -rw-r--r-- | .idea/compiler.xml | 4 | ||||
| -rw-r--r-- | .idea/modules.xml | 16 | ||||
| -rw-r--r-- | .idea/wallet-kotlin.iml | 19 |
5 files changed, 34 insertions, 18 deletions
diff --git a/.idea/.gitignore b/.idea/.gitignore index 3127cf3..8eae92b 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,10 +1,14 @@ # Default ignored files /shelf/ /artifacts -/modules +/modules* /workspace.xml /gradle.xml /libraries /caches /runConfigurations.xml -/encodings.xml
\ No newline at end of file +/encodings.xml +/vcs.xml +/compiler.xml +/jarRepositories.xml +/misc.xml
\ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 61a2480..69cf9a7 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,6 +1,11 @@ <component name="ProjectCodeStyleConfiguration"> <code_scheme name="Project" version="173"> <JetCodeStyleSettings> + <option name="PACKAGES_TO_USE_STAR_IMPORTS"> + <value> + <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" /> + </value> + </option> <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" /> <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" /> <option name="IMPORT_NESTED_CLASSES" value="true" /> diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ad4fc3c..72e41ea 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -12,6 +12,10 @@ <entry name="!?*.clj" /> </wildcardResourcePatterns> <bytecodeTargetLevel target="1.8"> + <module name="wallet-kotlin.common.jvmMain" target="1.6" /> + <module name="wallet-kotlin.common.jvmMain~1" target="1.6" /> + <module name="wallet-kotlin.common.jvmTest" target="1.6" /> + <module name="wallet-kotlin.common.jvmTest~1" target="1.6" /> <module name="wallet-kotlin_androidMain" target="1.6" /> <module name="wallet-kotlin_androidTest" target="1.6" /> </bytecodeTargetLevel> diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index d8c63dd..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin.iml" group="wallet-kotlin" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin_androidMain.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin_androidMain.iml" group="wallet-kotlin" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin_androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin_androidTest.iml" group="wallet-kotlin" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin_commonMain.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin_commonMain.iml" group="wallet-kotlin" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin_commonTest.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin_commonTest.iml" group="wallet-kotlin" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin_jsMain.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin_jsMain.iml" group="wallet-kotlin" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin_jsTest.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin_jsTest.iml" group="wallet-kotlin" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin_linuxMain.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin_linuxMain.iml" group="wallet-kotlin" /> - <module fileurl="file://$PROJECT_DIR$/.idea/modules/wallet-kotlin_linuxTest.iml" filepath="$PROJECT_DIR$/.idea/modules/wallet-kotlin_linuxTest.iml" group="wallet-kotlin" /> - </modules> - </component> -</project>
\ No newline at end of file diff --git a/.idea/wallet-kotlin.iml b/.idea/wallet-kotlin.iml new file mode 100644 index 0000000..57eb384 --- /dev/null +++ b/.idea/wallet-kotlin.iml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module external.linked.project.id="wallet-kotlin" 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> + <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> + <option name="BUILDABLE" value="false" /> + </configuration> + </facet> + </component> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/.gradle" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module>
\ No newline at end of file |