DEVOPS-837: Jenkins 2 Actions

.github/workflows/build.yml

@@ -0,0 +1,143 @@
+name: Catroid Pipeline
+
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+    branches:
+      - "**"
+  #  schedule:
+  #    - cron: "0 0 * * *" # Run daily at midnight
+  workflow_dispatch:
+    inputs:
+      WEB_TEST_URL:
+        description: "When set, all the archived APKs will point to this Catrobat web server, useful for testing web changes. E.g https://web-test.catrob.at"
+        required: false
+        type: string
+        default: ""
+      BUILD_ALL_FLAVOURS:
+        description: "When selected all flavours are built and archived as artifacts that can be installed alongside other versions of the same APKs"
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  build:
+    name: Build APK
+    runs-on: ubuntu-latest
+    env:
+      WEB_TEST_URL: ${{ inputs.WEB_TEST_URL != '' && format('-PwebTestUrl=''{0}''', inputs.WEB_TEST_URL) || '' }}
+      ALL_FLAVOURS_PARAMETERS: ${{ inputs.BUILD_ALL_FLAVOURS && 'assembleCreateAtSchoolDebug assembleLunaAndCatDebug assemblePhiroDebug assembleEmbroideryDesignerDebug assemblePocketCodeBetaDebug assembleMindstormsDebug' || '' }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: 21
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build APK
+        run: ./gradlew ${{ env.WEB_TEST_URL }} -Pindependent='#${{ github.run_number }} ${{ github.ref_name }}' assembleCatroidDebug ${{ env.ALL_FLAVOURS_PARAMETERS }}
+  # TODO: Check where to upload the APKs as GitHub Storage is an issue
+  #
+  #      - name: Rename APKs
+  #        run: |
+  #          for file in $(find . -name "*.apk"); do
+  #            mv "$file" "$(dirname "$file")/${{ github.ref_name }}-${{ github.run_number }}-$(basename "$file")"
+  #          done
+  #
+  #      - name: Archive APKs
+  #        uses: actions/upload-artifact@v4
+  #        with:
+  #          name: apk-artifacts
+  #          path: "**/*.apk"
+
+  unit-tests:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    env:
+      WEB_TEST_URL: ${{ inputs.WEB_TEST_URL != '' && format('-PwebTestUrl=''{0}''', inputs.WEB_TEST_URL) || '' }}
+      ALL_FLAVOURS_PARAMETERS: ${{ inputs.BUILD_ALL_FLAVOURS && 'assembleCreateAtSchoolDebug assembleLunaAndCatDebug assemblePhiroDebug assembleEmbroideryDesignerDebug assemblePocketCodeBetaDebug assembleMindstormsDebug' || '' }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: 21
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Run Unit Tests
+        run: ./gradlew -PenableCoverage jacocoTestCatroidDebugUnitTestReport --full-stacktrace
+
+      - name: Test Report
+        uses: dorny/test-reporter@v1
+        if: success() || failure()
+        with:
+          name: Unit Tests
+          path: catroid/build/test-results/testCatroidDebugUnitTest/*.xml
+          reporter: java-junit
+
+      - name: Upload Unit Test Reports
+        uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: unit-test-report
+          path: |
+            catroid/build/reports/tests/testCatroidDebugUnitTest
+
+  code-analysis:
+    name: Code Analysis
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tool:
+          - { name: "pmd", sarif: false }
+          - { name: "checkstyle", sarif: true }
+          - { name: "detekt", sarif: true }
+          - { name: "lint", sarif: true }
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: 21
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Run ${{ matrix.tool.name }} Analysis
+        run: |
+          case ${{ matrix.tool.name }} in
+            "pmd") ./gradlew pmd ;;
+            "checkstyle") ./gradlew checkstyle ;;
+            "detekt") ./gradlew detekt ;;
+            "lint") ./gradlew lintCatroidDebug ;;
+          esac
+
+      - name: Upload ${{ matrix.tool.name }} SARIF Report
+        uses: github/codeql-action/upload-sarif@v3
+        if: ${{ matrix.tool.sarif && (success() || failure()) }}
+        with:
+          sarif_file: catroid/build/reports/${{ matrix.tool.name }}.sarif
+          category: ${{ matrix.tool.name }}
+
+      - name: Upload ${{ matrix.tool.name }} HTML Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.tool.name }}-report
+          path: |
+            catroid/build/reports/html/${{ matrix.tool.name }}.html

build.gradle

@@ -24,10 +24,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '2.0.21'
     ext.koin_version = '2.1.6'
     ext.lifecycle_version = '2.2.0'
     ext.jacoco_core_version = '0.8.7'
+
     repositories {
         google()
         mavenCentral()
@@ -37,7 +38,7 @@ buildscript {
     dependencies {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jacoco:org.jacoco.core:$jacoco_core_version"
         classpath 'com.huawei.agconnect:agcp:1.4.2.300'

catroid/build.gradle

@@ -1,4 +1,4 @@
-import com.android.build.api.dsl.ManagedVirtualDevice
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 /*
  * Catroid: An on-device visual programming system for Android devices
@@ -26,15 +26,16 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.google.gms:google-services:4.3.10'
     }
 }
 
 plugins {
-    id "io.gitlab.arturbosch.detekt" version "1.23.0"
+    id "io.gitlab.arturbosch.detekt" version "1.23.7"
+    id 'com.google.devtools.ksp' version '2.0.21-1.0.25' apply true
     id 'checkstyle'
 }
 
@@ -51,18 +52,17 @@
 
     projectVersion = "0.9"
     gdxVersion = "1.9.10"
-    mockitoVersion = "3.12.4"
-    espressoVersion = "3.1.0"
-    playServicesVersion = '17.0.1'
-    cameraXVersion = "1.0.0-beta07"
-    room_version = "2.3.0"
-    coroutines_version = "1.3.2"
-    work_manager_version = '2.7.1'
+    mockitoVersion = '5.14.2'
+    espressoVersion = '3.6.1'
+    playServicesVersion = '18.1.1'
+    cameraXVersion = '1.4.0'
+    room_version = "2.6.1"
+    coroutines_version = '1.9.0'
+    work_manager_version = '2.9.1'
 }
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 
 apply from: 'gradle/code_quality_tasks.gradle'
 apply from: 'gradle/release_crowdin_tasks.gradle'
@@ -107,7 +107,6 @@
 
 android {
     compileSdk 34
-    buildToolsVersion = "33.0.2"
 
     namespace 'org.catrobat.catroid'
 
@@ -239,7 +238,6 @@
             buildConfigField "boolean", "FEATURE_CATBLOCKS_ENABLED", "true"
             buildConfigField "boolean", "FEATURE_CATBLOCKS_DEBUGABLE", "true"
             buildConfigField "boolean", "FEATURE_AI_ASSIST_ENABLED", "false"
-            testCoverageEnabled = rootProject.hasProperty('enableCoverage')
             signingConfig signingConfigs.debug
         }
 
@@ -259,24 +257,32 @@
 
     flavorDimensions = ["default"]
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
+
     androidResources {
         noCompress 'lite'
     }
+
     lint {
         abortOnError false
         baseline file('config/lint-baseline.xml')
-        htmlOutput file('build/reports/lint-report.html')
-        htmlReport true
+
         ignore 'GradleDependency', 'OldTargetApi', 'ExtraTranslation', 'MissingTranslation', 'LintBaseline', 'ObsoleteLintCustomCheck'
         lintConfig file('config/lint.xml')
-        textReport true
-        xmlOutput file('build/reports/lint-report.xml')
+
+        htmlReport true
+        htmlOutput file('build/reports/html/lint.html')
+
         xmlReport true
-    }
+        xmlOutput file('build/reports/lint.xml')
+
+        textReport true
 
+        sarifReport true
+        sarifOutput file('build/reports/lint.sarif')
+    }
 
     productFlavors {
         catroid {
@@ -319,8 +325,8 @@
         }
     }
 
-    applicationVariants.all { variant ->
-        variant.outputs.all { output ->
+    applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach { output ->
 
             if(variant.buildType.name == "signedRelease")
             {
@@ -341,7 +347,7 @@
             }
         }
     }
-    productFlavors.all { flavor ->
+    productFlavors.configureEach { flavor ->
         copyGoogleServicesFile(flavor.name, defaultConfig.applicationId + (flavor.applicationIdSuffix ?: ""))
     }
 }
@@ -370,7 +376,7 @@
     implementation "androidx.work:work-runtime:$work_manager_version"
 
     // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     androidTestImplementation project(path: ':catroid')
     androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
@@ -414,7 +420,8 @@
 
     // Room
     implementation("androidx.room:room-runtime:$room_version")
-    kapt("androidx.room:room-compiler:$room_version")
+    ksp("androidx.room:room-compiler:$room_version")
+
     // Kotlin Extensions and Coroutines support for Room
     implementation("androidx.room:room-ktx:$room_version")
 
@@ -536,7 +543,7 @@
     connectedCatroidDebugAndroidTest.ignoreFailures = true
 }
 
-task copyAndroidNatives {
+tasks.register('copyAndroidNatives') {
     doFirst {
         file("src/main/jniLibs/armeabi-v7a/").mkdirs()
         file("src/main/jniLibs/arm64-v8a/").mkdirs()
@@ -560,15 +567,15 @@
     }
 }
 
-tasks.whenTaskAdded { packageTask ->
+tasks.configureEach { packageTask ->
     if (packageTask.name.contains("package")) {
         packageTask.dependsOn 'copyAndroidNatives'
     }
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+tasks.withType(KotlinCompile).configureEach {
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = JavaVersion.VERSION_21
   }
 }