diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bf833e..23a719e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle path: build/reports/ jobs: - build_gradle_jdk14: + build_gradle_jdk15: <<: *defaults docker: - - image: openjdk:14-jdk + - image: cimg/openjdk:15.0 <<: *defaults_gradle @@ -42,7 +42,7 @@ jobs: <<: *defaults docker: - - image: circleci/openjdk:8-jdk + - image: cimg/openjdk:8.0 <<: *defaults_gradle @@ -51,5 +51,5 @@ workflows: gradle: jobs: - build_gradle_jdk8 - - build_gradle_jdk14 + - build_gradle_jdk15 diff --git a/.gitignore b/.gitignore index f58d3e5..d7c72b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ - !.vscode/extensions.json !.vscode/launch.json !.vscode/settings.json @@ -43,6 +42,7 @@ /**/.idea/**/replstate.xml /**/.idea/**/shelf /**/.idea/**/shelf/ +/**/.idea/**/sonarlint* /**/.idea/**/sqlDataSources.xml /**/.idea/**/tasks.xml /**/.idea/**/uiDesigner.xml diff --git a/.idea/akismet-kotlin.iml b/.idea/akismet-kotlin.iml deleted file mode 100644 index 78b2cc5..0000000 --- a/.idea/akismet-kotlin.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index ac476f9..5d3d4fc 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -26,5 +26,15 @@