diff options
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/codeStyles/Project.xml | 11 | ||||
| -rw-r--r-- | .idea/compiler.xml | 2 | ||||
| -rw-r--r-- | .idea/gradle.xml | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index dfca6e5..b23c749 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,7 +3,16 @@ <JetCodeStyleSettings> <option name="PACKAGES_TO_USE_STAR_IMPORTS"> <value> - <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" /> + <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" /> + </value> + </option> + <option name="PACKAGES_IMPORT_LAYOUT"> + <value> + <package name="" alias="false" withSubpackages="true" /> + <package name="java" alias="false" withSubpackages="true" /> + <package name="javax" alias="false" withSubpackages="true" /> + <package name="kotlin" alias="false" withSubpackages="true" /> + <package name="" alias="true" withSubpackages="true" /> </value> </option> <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" /> diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b209367..2b48706 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -12,8 +12,6 @@ <entry name="!?*.clj" /> </wildcardResourcePatterns> <bytecodeTargetLevel> - <module name="common_jvmMain" target="1.6" /> - <module name="common_jvmTest" target="1.6" /> <module name="taler-kotlin-common_jvmMain" target="1.6" /> <module name="taler-kotlin-common_jvmTest" target="1.6" /> </bytecodeTargetLevel> diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 25f810e..b5fb24f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -14,10 +14,10 @@ <option value="$PROJECT_DIR$/cashier" /> <option value="$PROJECT_DIR$/merchant-lib" /> <option value="$PROJECT_DIR$/merchant-terminal" /> + <option value="$PROJECT_DIR$/multiplatform" /> + <option value="$PROJECT_DIR$/multiplatform/common" /> <option value="$PROJECT_DIR$/taler-kotlin-android" /> <option value="$PROJECT_DIR$/wallet" /> - <option value="$PROJECT_DIR$/wallet-kotlin" /> - <option value="$PROJECT_DIR$/wallet-kotlin/common" /> </set> </option> <option name="resolveModulePerSourceSet" value="false" /> |