diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml deleted file mode 100644 index bdf7c5f..0000000 --- a/.idea/modules/simple-database-kotlin_test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml deleted file mode 100644 index bdf7c5f..0000000 --- a/.idea/modules/simple-database-kotlin_test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_main.iml b/.idea/modules/simple_database_kotlin_main.iml new file mode 100644 index 0000000..52d8a33 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_main.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml deleted file mode 100644 index bdf7c5f..0000000 --- a/.idea/modules/simple-database-kotlin_test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_main.iml b/.idea/modules/simple_database_kotlin_main.iml new file mode 100644 index 0000000..52d8a33 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_main.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_test.iml b/.idea/modules/simple_database_kotlin_test.iml new file mode 100644 index 0000000..abf4720 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml deleted file mode 100644 index bdf7c5f..0000000 --- a/.idea/modules/simple-database-kotlin_test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_main.iml b/.idea/modules/simple_database_kotlin_main.iml new file mode 100644 index 0000000..52d8a33 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_main.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_test.iml b/.idea/modules/simple_database_kotlin_test.iml new file mode 100644 index 0000000..abf4720 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml deleted file mode 100644 index bdf7c5f..0000000 --- a/.idea/modules/simple-database-kotlin_test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_main.iml b/.idea/modules/simple_database_kotlin_main.iml new file mode 100644 index 0000000..52d8a33 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_main.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_test.iml b/.idea/modules/simple_database_kotlin_test.iml new file mode 100644 index 0000000..abf4720 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3411d6f..6c50bb0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ group 'nl.astraeus.database' -version '1.2.6-SNAPSHOT' +version '1.2.8-SNAPSHOT' apply plugin: 'kotlin' apply plugin: 'idea' apply plugin: 'maven' apply plugin: 'findbugs' +apply plugin: 'maven-publish' sourceSets { main.java.srcDirs += 'src' @@ -32,7 +33,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "nl.astraeus.database:simple-database:1.2.3-SNAPSHOT" + compile "nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" } uploadArchives { @@ -55,3 +56,11 @@ javadoc { failOnError = false } + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml deleted file mode 100644 index bdf7c5f..0000000 --- a/.idea/modules/simple-database-kotlin_test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_main.iml b/.idea/modules/simple_database_kotlin_main.iml new file mode 100644 index 0000000..52d8a33 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_main.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_test.iml b/.idea/modules/simple_database_kotlin_test.iml new file mode 100644 index 0000000..abf4720 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3411d6f..6c50bb0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ group 'nl.astraeus.database' -version '1.2.6-SNAPSHOT' +version '1.2.8-SNAPSHOT' apply plugin: 'kotlin' apply plugin: 'idea' apply plugin: 'maven' apply plugin: 'findbugs' +apply plugin: 'maven-publish' sourceSets { main.java.srcDirs += 'src' @@ -32,7 +33,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "nl.astraeus.database:simple-database:1.2.3-SNAPSHOT" + compile "nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" } uploadArchives { @@ -55,3 +56,11 @@ javadoc { failOnError = false } + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} diff --git a/simple-database-kotlin.ipr b/simple-database-kotlin.ipr index cd051d1..f0ea744 100644 --- a/simple-database-kotlin.ipr +++ b/simple-database-kotlin.ipr @@ -42,11 +42,6 @@ - @@ -62,7 +57,6 @@ - @@ -74,13 +68,13 @@ - + - + - + @@ -92,9 +86,9 @@ - + - + @@ -115,40 +109,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml deleted file mode 100644 index bdf7c5f..0000000 --- a/.idea/modules/simple-database-kotlin_test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_main.iml b/.idea/modules/simple_database_kotlin_main.iml new file mode 100644 index 0000000..52d8a33 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_main.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_test.iml b/.idea/modules/simple_database_kotlin_test.iml new file mode 100644 index 0000000..abf4720 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3411d6f..6c50bb0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ group 'nl.astraeus.database' -version '1.2.6-SNAPSHOT' +version '1.2.8-SNAPSHOT' apply plugin: 'kotlin' apply plugin: 'idea' apply plugin: 'maven' apply plugin: 'findbugs' +apply plugin: 'maven-publish' sourceSets { main.java.srcDirs += 'src' @@ -32,7 +33,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "nl.astraeus.database:simple-database:1.2.3-SNAPSHOT" + compile "nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" } uploadArchives { @@ -55,3 +56,11 @@ javadoc { failOnError = false } + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} diff --git a/simple-database-kotlin.ipr b/simple-database-kotlin.ipr index cd051d1..f0ea744 100644 --- a/simple-database-kotlin.ipr +++ b/simple-database-kotlin.ipr @@ -42,11 +42,6 @@ - @@ -62,7 +57,6 @@ - @@ -74,13 +68,13 @@ - + - + - + @@ -92,9 +86,9 @@ - + - + @@ -115,40 +109,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/nl/astraeus/database/Queries.kt b/src/nl/astraeus/database/Queries.kt index 1a5b328..6cd1b66 100644 --- a/src/nl/astraeus/database/Queries.kt +++ b/src/nl/astraeus/database/Queries.kt @@ -8,11 +8,11 @@ * Time: 16:46 */ -fun execute(query: String, vararg args: String) = Persister.execute(query, *args) +fun execute(query: String, vararg args: Any) = Persister.execute(query, *args); -fun query(query: String, vararg args: String): ResultSet = Persister.executeQuery(query, *args) +fun query(query: String, vararg args: Any): ResultSet = Persister.executeQuery(query, *args) -fun update(query: String, vararg args: String): Int = Persister.executeUpdate(query, *args) +fun update(query: String, vararg args: Any): Int = Persister.executeUpdate(query, *args) abstract class Dao(val cls: Class) { @@ -20,8 +20,8 @@ Persister.init(cls) } - open fun find(id: Long): T = Persister.find(cls, id) - open fun find(query: String, vararg args: Any): T = Persister.findWhere(cls, query, *args) + open fun find(id: Long): T? = Persister.find(cls, id) + open fun find(query: String, vararg args: Any): T? = Persister.findWhere(cls, query, *args) open fun insert(obj: T) = Persister.insert(obj) open fun update(obj: T) = Persister.update(obj) diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7ecef98 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a5c3ae1 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_11.xml b/.idea/libraries/Gradle__junit_junit_4_11.xml new file mode 100644 index 0000000..dc26b34 --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_11.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml new file mode 100644 index 0000000..f9056ef --- /dev/null +++ b/.idea/libraries/Gradle__nl_astraeus_database_simple_database_1_2_4_SNAPSHOT.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..8262f72 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..296c449 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a11c4aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin.iml b/.idea/modules/simple-database-kotlin.iml new file mode 100644 index 0000000..d749fb4 --- /dev/null +++ b/.idea/modules/simple-database-kotlin.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml deleted file mode 100644 index ded1b59..0000000 --- a/.idea/modules/simple-database-kotlin_main.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml deleted file mode 100644 index bdf7c5f..0000000 --- a/.idea/modules/simple-database-kotlin_test.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_main.iml b/.idea/modules/simple_database_kotlin_main.iml new file mode 100644 index 0000000..52d8a33 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_main.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_kotlin_test.iml b/.idea/modules/simple_database_kotlin_test.iml new file mode 100644 index 0000000..abf4720 --- /dev/null +++ b/.idea/modules/simple_database_kotlin_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3411d6f..6c50bb0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ group 'nl.astraeus.database' -version '1.2.6-SNAPSHOT' +version '1.2.8-SNAPSHOT' apply plugin: 'kotlin' apply plugin: 'idea' apply plugin: 'maven' apply plugin: 'findbugs' +apply plugin: 'maven-publish' sourceSets { main.java.srcDirs += 'src' @@ -32,7 +33,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "nl.astraeus.database:simple-database:1.2.3-SNAPSHOT" + compile "nl.astraeus.database:simple-database:1.2.4-SNAPSHOT" } uploadArchives { @@ -55,3 +56,11 @@ javadoc { failOnError = false } + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} diff --git a/simple-database-kotlin.ipr b/simple-database-kotlin.ipr index cd051d1..f0ea744 100644 --- a/simple-database-kotlin.ipr +++ b/simple-database-kotlin.ipr @@ -42,11 +42,6 @@ - @@ -62,7 +57,6 @@ - @@ -74,13 +68,13 @@ - + - + - + @@ -92,9 +86,9 @@ - + - + @@ -115,40 +109,40 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/nl/astraeus/database/Queries.kt b/src/nl/astraeus/database/Queries.kt index 1a5b328..6cd1b66 100644 --- a/src/nl/astraeus/database/Queries.kt +++ b/src/nl/astraeus/database/Queries.kt @@ -8,11 +8,11 @@ * Time: 16:46 */ -fun execute(query: String, vararg args: String) = Persister.execute(query, *args) +fun execute(query: String, vararg args: Any) = Persister.execute(query, *args); -fun query(query: String, vararg args: String): ResultSet = Persister.executeQuery(query, *args) +fun query(query: String, vararg args: Any): ResultSet = Persister.executeQuery(query, *args) -fun update(query: String, vararg args: String): Int = Persister.executeUpdate(query, *args) +fun update(query: String, vararg args: Any): Int = Persister.executeUpdate(query, *args) abstract class Dao(val cls: Class) { @@ -20,8 +20,8 @@ Persister.init(cls) } - open fun find(id: Long): T = Persister.find(cls, id) - open fun find(query: String, vararg args: Any): T = Persister.findWhere(cls, query, *args) + open fun find(id: Long): T? = Persister.find(cls, id) + open fun find(query: String, vararg args: Any): T? = Persister.findWhere(cls, query, *args) open fun insert(obj: T) = Persister.insert(obj) open fun update(obj: T) = Persister.update(obj) diff --git a/test/nl/astraeus/database/TestQueries.kt b/test/nl/astraeus/database/TestQueries.kt index 9339f48..3f20cbb 100644 --- a/test/nl/astraeus/database/TestQueries.kt +++ b/test/nl/astraeus/database/TestQueries.kt @@ -23,7 +23,9 @@ fun users(): List { return transaction> { - UserDao.where("company = ?", id) + var dao = UserDao() + + dao.where("company = ?", id) } } } @@ -46,21 +48,25 @@ protected constructor(): this(Company(""), User(Company(""), "", "")) } -object CompanyDao: Dao(Company::class.java) +class CompanyDao(): Dao(Company::class.java) -object UserDao: Dao(User::class.java) +class UserDao(): Dao(User::class.java) -object MTMDao: Dao(ManyToMany::class.java) { +class MTMDao(): Dao(ManyToMany::class.java) { fun users(comp: Company): List { return transaction> { - UserDao.from("join manytomany where manytomany.user = usr.id and manytomany.company = ?", comp.id) + var dao = UserDao() + + dao.from("join manytomany where manytomany.user = usr.id and manytomany.company = ?", comp.id) } } fun companies(user: User): List { return transaction> { - CompanyDao.from("join manytomany where manytomany.company = company.id and manytomany.user = ?", user.id) + var dao = CompanyDao() + + dao.from("join manytomany where manytomany.company = company.id and manytomany.user = ?", user.id) } } } @@ -93,51 +99,56 @@ } @Test fun testWhere() { + var companyDao = CompanyDao() + var userDao = UserDao() + var mtmDao = MTMDao() transaction { - val company = Company("company") + var company = Company("company") - val rien = User(company, "Rien", "info@somewhere.com") - val piet = User(company, "Piet", "piet@somewhere.com") + var rien = User(company, "Rien", "info@somewhere.com") + var piet = User(company, "Piet", "piet@somewhere.com") - UserDao.insert(rien) - UserDao.upsert(piet) + userDao.insert(rien) + userDao.upsert(piet) rien.name = "Rrrrien" - UserDao.update(rien) + userDao.update(rien) piet.email = "pietje@somewhere.com" - UserDao.upsert(piet) + userDao.upsert(piet) - MTMDao.insert(ManyToMany(company, rien)) - MTMDao.insert(ManyToMany(company, piet)) - MTMDao.insert(ManyToMany(Company("Other company"), rien)) + mtmDao.insert(ManyToMany(company, rien)) + mtmDao.insert(ManyToMany(company, piet)) + mtmDao.insert(ManyToMany(Company("Other company"), rien)) } transaction { val user = UserDao.find("name = ?", "Rrrrien") - user.company.name = "Better Company!" + if (user != null) { + user.company.name = "Better Company!" CompanyDao.update(user.company) val companies = MTMDao.companies(user) - for (company in companies) { - println("Company from ${user.name} -> ${company.name}") + for (company in companies) { + println("Company from ${user.name} -> ${company.name}") + } } } transaction { - val found = UserDao.where("name = ?", "Rrrrien") + var found = userDao.where("name = ?", "Rrrrien") assertTrue(found.size == 1) - assertTrue(UserDao.all().size == 2) + assertTrue(userDao.all().size == 2) - assertTrue(UserDao.count("name = ?", "Piet") == 1) + assertTrue(userDao.count("name = ?", "Piet") == 1) - for(company in CompanyDao.all()) { + for(company in companyDao.all()) { println("Company: #${company.id} - ${company.name}") for(user in company.users()) { @@ -145,7 +156,7 @@ } } - for(user in UserDao.all()) { + for(user in userDao.all()) { println("Found: #${user.id} - ${user.name} - ${user.email} - ${user.company.name}") }