From 6f390e017f070de903ee4a889990fbe4063bb1a9 Mon Sep 17 00:00:00 2001 From: ItsTimetoforget Date: Fri, 26 Jan 2024 06:55:54 +0100 Subject: [PATCH 1/7] add sonarcloud --- .github/workflows/sonarcloud.yml | 35 ++++++++++++++++++++++++++++++++ build.gradle | 15 ++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 .github/workflows/sonarcloud.yml diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml new file mode 100644 index 0000000..d743101 --- /dev/null +++ b/.github/workflows/sonarcloud.yml @@ -0,0 +1,35 @@ +name: SonarCloud +on: + push: + pull_request: + types: [opened, synchronize, reopened] +jobs: + build: + name: Build and analyze + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: 'zulu' # Alternative distribution options are available + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: ./gradlew build sonar --info \ No newline at end of file diff --git a/build.gradle b/build.gradle index 8b23837..f13d908 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,18 @@ buildscript { } } +plugins { + id "org.sonarqube" version "4.4.1.3373" +} + +sonar { + properties { + property "sonar.projectKey", "golem-reader_app" + property "sonar.organization", "golem-reader" + property "sonar.host.url", "https://sonarcloud.io" + } +} + allprojects { repositories { google() @@ -29,6 +41,9 @@ allprojects { } } + tasks.register('clean', Delete) { delete rootProject.buildDir } + + From 8c7d6c42f33a6f40d4b300b21187484bd2a27953 Mon Sep 17 00:00:00 2001 From: ItsTimetoforget Date: Fri, 26 Jan 2024 06:57:12 +0100 Subject: [PATCH 2/7] add sonarcloud --- .github/workflows/sonarcloud.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index d743101..03e565e 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -28,6 +28,8 @@ jobs: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} restore-keys: ${{ runner.os }}-gradle + - name: chmod + run: chmod +x ./gradlew - name: Build and analyze env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any From 6b9646cc7a52e8ba62a964f9257a8f39efae70a8 Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 27 Jan 2024 17:42:00 +0100 Subject: [PATCH 3/7] try to fix the runner --- gradle.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 94d20af..b226d81 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,5 @@ android.defaults.buildfeatures.buildconfig=true android.enableJetifier=false android.nonFinalResIds=false android.nonTransitiveRClass=false -android.useAndroidX=true \ No newline at end of file +android.useAndroidX=true +org.gradle.jvmargs=-Xmx512m "-XX:MaxMetaspaceSize=256m" \ No newline at end of file From 837dc282f07c781a874d4ab164f843be5737cf54 Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 27 Jan 2024 19:44:48 +0100 Subject: [PATCH 4/7] try to fix the runner --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b226d81..fe463ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,4 +3,4 @@ android.enableJetifier=false android.nonFinalResIds=false android.nonTransitiveRClass=false android.useAndroidX=true -org.gradle.jvmargs=-Xmx512m "-XX:MaxMetaspaceSize=256m" \ No newline at end of file +org.gradle.jvmargs=-Xmx1024m "-XX:MaxMetaspaceSize=512m" \ No newline at end of file From c7e6aa0cb543518e37137e3f4dc476e234139053 Mon Sep 17 00:00:00 2001 From: itstimetoforget Date: Tue, 28 May 2024 20:06:10 +0200 Subject: [PATCH 5/7] fix action --- .../java/de/eknoes/inofficialgolem/updater/GolemFetcher.java | 3 +++ build.gradle | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/eknoes/inofficialgolem/updater/GolemFetcher.java b/app/src/main/java/de/eknoes/inofficialgolem/updater/GolemFetcher.java index 3cf9d72..3f10c56 100644 --- a/app/src/main/java/de/eknoes/inofficialgolem/updater/GolemFetcher.java +++ b/app/src/main/java/de/eknoes/inofficialgolem/updater/GolemFetcher.java @@ -1,5 +1,6 @@ package de.eknoes.inofficialgolem.updater; +import android.annotation.SuppressLint; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; @@ -17,6 +18,7 @@ import de.eknoes.inofficialgolem.FeedReaderContract; import de.eknoes.inofficialgolem.FeedReaderDbHelper; import de.eknoes.inofficialgolem.R; +import kotlin.Suppress; import java.lang.ref.WeakReference; import java.util.Date; @@ -140,6 +142,7 @@ protected void onPostExecute(GolemFetcher.FETCH_STATE finished) { } } + @SuppressLint("Range") private void writeArticles(List articles, boolean insertNew) { for (GolemItem item : articles) { if (isCancelled() || db == null) { diff --git a/build.gradle b/build.gradle index f13d908..1083555 100644 --- a/build.gradle +++ b/build.gradle @@ -24,8 +24,9 @@ plugins { sonar { properties { - property "sonar.projectKey", "golem-reader_app" - property "sonar.organization", "golem-reader" + //TODO change this + property "sonar.projectKey", "Zusel_golem-android-reader" + property "sonar.organization", "main-org" property "sonar.host.url", "https://sonarcloud.io" } } From 8270521b62cf2f89cbd9974d656af4111ead83ec Mon Sep 17 00:00:00 2001 From: itstimetoforget Date: Tue, 28 May 2024 20:19:44 +0200 Subject: [PATCH 6/7] fix action --- .github/workflows/sonarcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 03e565e..7f00c8b 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -1,8 +1,8 @@ name: SonarCloud on: - push: pull_request: types: [opened, synchronize, reopened] + jobs: build: name: Build and analyze From 288dfa9b3a836151068e2e6e0c59714e95abe4e7 Mon Sep 17 00:00:00 2001 From: itstimetoforget Date: Tue, 28 May 2024 20:31:17 +0200 Subject: [PATCH 7/7] fix action --- .github/workflows/sonarcloud.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 7f00c8b..0a5f710 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -1,5 +1,8 @@ name: SonarCloud on: + push: + branches: + - master pull_request: types: [opened, synchronize, reopened]