diff --git a/.circleci/config.yml b/.circleci/config.yml index e6c4f38..86b3b8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,19 +30,19 @@ defaults_gradle: &defaults_gradle path: build/reports/ jobs: - build_gradle_jdk18: + build_gradle_jdk13: <<: *defaults docker: - - image: cimg/openjdk:18.0 + - image: openjdk:13-jdk <<: *defaults_gradle - build_gradle_jdk11: + build_gradle_jdk8: <<: *defaults docker: - - image: cimg/openjdk:11.0 + - image: circleci/openjdk:8-jdk <<: *defaults_gradle @@ -50,6 +50,6 @@ workflows: version: 2 gradle: jobs: - - build_gradle_jdk11 - - build_gradle_jdk18 + - build_gradle_jdk8 + - build_gradle_jdk13 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 193e95b..2801719 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,52 +1,21 @@ -name: gradle-ci +name: Java CI with Gradle -on: [ push, pull_request, workflow_dispatch ] +on: [push, pull_request, workflow_dispatch] jobs: build: runs-on: ubuntu-latest - env: - GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m" - SONAR_JDK: "17" - - strategy: - matrix: - java-version: [ 11, 17, 20 ] - steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 with: - fetch-depth: 0 - - - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: ${{ matrix.java-version }} - + java-version: 1.8 - name: Grant execute permission for gradlew run: chmod +x gradlew - - - name: Cache SonarCloud packages - if: matrix.java-version == env.SONAR_JDK - uses: actions/cache@v3 - with: - path: ~/.sonar/cache - key: ${{ runner.os }}-sonar - restore-keys: ${{ runner.os }}-sonar - - name: Test with Gradle - uses: gradle/gradle-build-action@v2 + run: ./gradlew check env: AKISMET_BLOG: ${{ secrets.AKISMET_BLOG }} AKISMET_API_KEY: ${{ secrets.AKISMET_API_KEY }} - with: - arguments: build check --stacktrace - - - name: SonarCloud - if: success() && matrix.java-version == env.SONAR_JDK - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./gradlew sonar --info diff --git a/.gitignore b/.gitignore index ac52a18..f007981 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,12 @@ +.vscode/* !.vscode/extensions.json !.vscode/launch.json !.vscode/settings.json !.vscode/tasks.json -*.class -*.code-workspace -*.ctxt -*.iws -*.log -*.nar -*.rar -*.sublime-* -*.tar.gz -*.zip -.DS_Store + +__pycache__ .classpath +.DS_Store .gradle .history .kobalt @@ -24,9 +17,17 @@ .project .scannerwork .settings -.vscode/* -/**/.idea/$CACHE_FILE$ -/**/.idea/$PRODUCT_WORKSPACE_FILE$ +*.class +*.code-workspace +*.ctxt +*.iws +*.log +*.nar +*.rar +*.sublime-* +*.tar.gz +*.zip +/**/.idea_modules/ /**/.idea/**/caches/build_file_checksums.ser /**/.idea/**/contentModel.xml /**/.idea/**/dataSources.ids @@ -42,15 +43,13 @@ /**/.idea/**/replstate.xml /**/.idea/**/shelf /**/.idea/**/shelf/ -/**/.idea/**/sonarlint* /**/.idea/**/sqlDataSources.xml /**/.idea/**/tasks.xml /**/.idea/**/uiDesigner.xml /**/.idea/**/usage.statistics.xml /**/.idea/**/workspace.xml -/**/.idea_modules/ -Thumbs.db -__pycache__ +/**/.idea/$CACHE_FILE$ +/**/.idea/$PRODUCT_WORKSPACE_FILE$ atlassian-ide-plugin.xml bin/ build/ @@ -64,6 +63,7 @@ dist/ ehthumbs.db fabric.properties gen/ +gradle.properties hs_err_pid* kobaltBuild kobaltw*-test @@ -71,7 +71,6 @@ lib/kotlin* libs/ local.properties out/ -pom.xml.asc pom.xml.next pom.xml.releaseBackup pom.xml.tag @@ -81,4 +80,5 @@ project.properties release.properties target/ test-output +Thumbs.db venv diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1601b0b..26820aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ -image: gradle:8-jdk11 +image: gradle:alpine variables: - GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m" + GRADLE_OPTS: "-Dorg.gradle.daemon=false" before_script: - export GRADLE_USER_HOME=`pwd`/.gradle @@ -12,7 +12,7 @@ stages: build: stage: build - script: gradle --build-cache assemble + script: ./gradlew --build-cache assemble cache: key: "$CI_COMMIT_REF_NAME" policy: push @@ -22,7 +22,7 @@ build: test: stage: test - script: gradle check + script: ./gradlew check cache: key: "$CI_COMMIT_REF_NAME" policy: pull diff --git a/.idea/akismet-kotlin.iml b/.idea/akismet-kotlin.iml new file mode 100644 index 0000000..78b2cc5 --- /dev/null +++ b/.idea/akismet-kotlin.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 3ad4dc5..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index 79ee123..d91f848 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index dd5077a..ac476f9 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -26,25 +26,5 @@