Merge pull request #8565 from nextcloud/revertKotlin

revert Kotlin version to make Jacoco work again

.drone.yml

@@ -103,14 +103,7 @@ steps:
       - emulator -avd android -no-snapshot -gpu swiftshader_indirect -no-window -no-audio -skin 500x833 &
       - sed -i s'#<bool name="is_beta">false</bool>#<bool name="is_beta">true</bool>#'g src/main/res/values/setup.xml
       - sed -i s"#1#5#" ./src/androidTest/java/com/nextcloud/client/RetryTestRule.kt
-      - ./gradlew assembleGplay
-      - ./gradlew assembleGplayDebug
-      - scripts/wait_for_emulator.sh
-      - ./gradlew jacocoTestGplayDebugUnitTestReport && scripts/deleteOutdatedComments.sh "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
-      - ./gradlew installGplayDebugAndroidTest
-      - scripts/wait_for_server.sh "server"
-      - ./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest && scripts/deleteOutdatedComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
-      - scripts/runCombinedTest.sh
+      - scripts/runCombinedTest.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER
 
   - name: notify
     image: drillster/drone-email

build.gradle

@@ -9,7 +9,7 @@ import org.gradle.internal.jvm.Jvm
 // its root folder, another one for the app module in subfolder of root.
 
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.4.32'
     repositories {
         google()
         maven {
@@ -56,7 +56,6 @@ configurations {
 }
 
 ext {
-    jacocoVersion = "0.8.2"
     daggerVersion = "2.36"
     markwonVersion =  "4.6.2"
     prismVersion = "2.0.0"
@@ -65,7 +64,7 @@ ext {
     mockitoVersion = "3.11.0"
     mockkVersion = "1.10.4"
     powermockVersion = "2.0.9"
-    byteBuddyVersion = "1.11.0"
+    byteBuddyVersion = "1.11.2"
     espressoVersion = "3.3.0"
     workRuntime = "2.5.0"
     fidoVersion = "4.4.0"
@@ -388,14 +387,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2')
 
-//    jacocoAnt "org.jacoco:org.jacoco.ant:${jacocoVersion}"
-//    jacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}"
-//    androidJacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}"
-//    androidJacocoAnt "org.jacoco:org.jacoco.ant:${jacocoVersion}"
-//    androidJacocoAnt "org.jacoco:org.jacoco.core:${jacocoVersion}"
-//    androidJacocoAnt "org.jacoco:org.jacoco.report:${jacocoVersion}"
-//    androidJacocoAnt "org.jacoco:org.jacoco.agent:${jacocoVersion}"
-
     implementation "com.github.stateless4j:stateless4j:2.6.0"
 }
 

scripts/runCombinedTest.sh

@@ -1,5 +1,36 @@
 #!/bin/bash
 
+GIT_USERNAME=$1
+GIT_TOKEN=$2
+DRONE_PULL_REQUEST=$3
+LOG_USERNAME=$4
+LOG_PASSWORD=$5
+DRONE_BUILD_NUMBER=$6
+
+./gradlew assembleGplay
+./gradlew assembleGplayDebug
+
+scripts/wait_for_emulator.sh
+./gradlew jacocoTestGplayDebugUnitTestReport 
+status=$?
+
+if [ $status -eq 0 ]; then
+    scripts/deleteOutdatedComments.sh "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+else 
+    bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+fi
+
+./gradlew installGplayDebugAndroidTest
+scripts/wait_for_server.sh "server"
+./gradlew createGplayDebugCoverageReport -Pcoverage -Pandroid.testInstrumentationRunnerArguments.notAnnotation=com.owncloud.android.utils.ScreenshotTest
+status=$?
+
+if [ $status -eq 0 ]; then
+    scripts/deleteOutdatedComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+else 
+    bash scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+fi
+
 ./gradlew combinedTestReport
 status=$?