From a03cade835362add7b6b9692197b510fc10535a3 Mon Sep 17 00:00:00 2001
From: aminecmi <aminecmi@gmail.com>
Date: Fri, 6 Oct 2023 21:12:47 +0200
Subject: [PATCH] WIP

---
 .drone.yml          | 45 +++++++++++++++++++++------------------------
 gradle.properties   |  1 -
 settings.gradle.kts | 13 -------------
 3 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c21cbda..dd1b0c3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,35 +3,32 @@ type: docker
 name: test
 
 steps:
+  - name: Lint
+    failure: ignore
+    image: mingc/android-build-box:latest
+    commands:
+      - echo "---------------------------------------------------------"
+      - echo "Install linters..."
+      - curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
+      - curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.1/detekt-cli-1.23.1.zip && unzip detekt-cli-1.23.1.zip
+      - echo "---------------------------------------------------------"
+      - echo "Linting..."
+      - ktlint || true
+      - echo "---------------------------------------------------------"
+      - echo "Detecting..."
+      - ./detekt-cli-1.23.1/bin/detekt-cli --all-rules || true
+      - echo "---------------------------------------------------------"
+    command_timeout: 1m
   - name: BuildAndTest
     image: mingc/android-build-box:latest
     commands:
       - echo "---------------------------------------------------------"
       - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
       - echo "---------------------------------------------------------"
-      - echo "Building..."
-      - ./gradlew build -x test
+      - echo "Building and testing..."
+      - ./gradlew build
       - echo "---------------------------------------------------------"
-      - echo "Testing..."
-      - echo "---------------------------------------------------------"
-      - ./gradlew koverMergedXmlReport
-    environment:
-      TZ: Europe/Paris
-      SONAR_HOST_URL:
-        from_secret: sonarScannerHostUrl
-      SONAR_LOGIN:
-        from_secret: sonarScannerLogin
-  - name: Analyse
-    image: kytay/sonar-node-plugin
-    settings:
-      sonar_host:
-        from_secret: sonarScannerHostUrl
-      sonar_token:
-        from_secret: sonarScannerLogin
-      use_node_version: 16.18.1
-      sonar_debug: true
-      sonar_project_settings: ./sonar-project.properties
 trigger:
   event:
     - push
@@ -107,10 +104,10 @@ steps:
       - git fetch --tags
       - echo "---------------------------------------------------------"
       - echo "Configure gradle..."
-      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
       - echo "---------------------------------------------------------"
       - echo "Generate APK"
-      - ./gradlew :androidApp:assembleGithubConfigRelease  -P pushCache=false
+      - ./gradlew :androidApp:assembleGithubConfigRelease
       - echo "---------------------------------------------------------"
       - echo "Get Key"
       - wget https://amine-louveau.fr/key
diff --git a/gradle.properties b/gradle.properties
index a7c8941..df0edb7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,4 +33,3 @@ org.gradle.parallel=true
 org.gradle.caching=true
 ignoreGitVersion=false
 kotlin.native.cacheKind.iosX64=none
-pushCache=true
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5b7e8e0..2aaa979 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,3 @@
-val pushCache: String by settings
-
 pluginManagement {
     repositories {
         // maven { url = uri("https://nexus.amine-louveau.fr/repository/maven-public/")}
@@ -17,17 +15,6 @@ dependencyResolutionManagement {
     }
 }
 
-
-buildCache {
-    remote<HttpBuildCache> {
-        url = uri("http://18.0.0.7:3071/cache/")
-        isAllowInsecureProtocol = true
-        isAllowUntrustedServer = true
-        isUseExpectContinue = true
-        isPush = (pushCache == "true")
-    }
-}
-
 rootProject.name = "ReaderForSelfossV2"
 include(":androidApp")
 include(":shared")
\ No newline at end of file