commit e22d477d5bc076fecec9d732b04cedb59b33a5f2
parent 72ca3be4e989a9bcc9da76956d5624fc72ba8be0
Author: Florian Dold <florian.dold@gmail.com>
Date: Fri, 1 Nov 2019 11:18:28 +0100
project structure
Diffstat:
11 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
@@ -9,7 +9,7 @@
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="/usr/share/java/gradle" />
- <option name="gradleJvm" value="#JAVA_INTERNAL" />
+ <option name="gradleJvm" value="11" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@@ -17,6 +17,7 @@
<option value="$PROJECT_DIR$/sandbox" />
</set>
</option>
+ <option name="useAutoImport" value="true" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,8 +0,0 @@
-<component name="InspectionProjectProfileManager">
- <profile version="1.0">
- <option name="myName" value="Project Default" />
- <inspection_tool class="PropertyName" enabled="true" level="WEAK WARNING" enabled_by_default="true">
- <option name="namePattern" value="_?[a-z][A-Za-z\d]*" />
- </inspection_tool>
- </profile>
-</component>
-\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Kotlin2JvmCompilerArguments">
+ <option name="jvmTarget" value="11" />
+ </component>
+</project>
+\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/.idea/modules/libeufin.iml b/.idea/modules/libeufin.iml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$/../.." />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
-\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1 @@
kotlin.code.style=official
-kotlin.incremental=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Nov 01 10:46:40 CET 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/nexus/build.gradle b/nexus/build.gradle
@@ -4,20 +4,19 @@ plugins {
id 'application'
}
-
-version '1.0-snapshot'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = '11'
+targetCompatibility = '11'
+version = '0.0.1'
compileKotlin {
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = '11'
}
}
compileTestKotlin {
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = '11'
}
}
@@ -34,7 +33,6 @@ dependencies {
compile "javax.activation:activation:1.1"
compile "org.glassfish.jaxb:jaxb-runtime:2.3.1"
testCompile group: 'junit', name: 'junit', version: '4.12'
- runtime rootProject.files("resources")
}
application {
diff --git a/resources/logback.xml b/nexus/src/resources/logback.xml
diff --git a/sandbox/build.gradle b/sandbox/build.gradle
@@ -4,19 +4,20 @@ plugins {
id 'application'
}
+
+sourceCompatibility = "11"
+targetCompatibility = "11"
version '1.0-snapshot'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
compileKotlin {
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = "11"
}
}
compileTestKotlin {
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = "11"
}
}
@@ -40,7 +41,6 @@ dependencies {
testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.3.50'
testImplementation 'org.jetbrains.kotlin:kotlin-test:1.3.50'
compile 'org.apache.santuario:xmlsec:2.1.4'
- runtime rootProject.files("resources")
}
application {
diff --git a/resources/logback.xml b/sandbox/src/resources/logback.xml
