Merge branch '3833-master-upgrade' into 'master'

image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:legacy"

image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"

stages:

  - build

variables:

  GRADLE_VERSION: "gradle-5.4.1"

  GIT_SUBMODULE_STRATEGY: "recursive"

before_script:

  - git fetch

  - export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64

  - export GRADLE_USER_HOME=$(pwd)/.gradle

  - curl -sL https://services.gradle.org/distributions/${GRADLE_VERSION}-bin.zip -o /gradle.zip

  - unzip /gradle.zip -d /gradle

  - PATH="$PATH:/gradle/${GRADLE_VERSION}/bin"

  - JAVA_TOOL_OPTIONS="${JAVA_TOOL_OPTIONS} -Dfile.encoding=UTF8"

  - gradle dependencies

  - chmod +x ./gradlew

cache:

  key: ${CI_PROJECT_ID}

build:

  stage: build

  script:

    - gradle assemble

    - ./gradlew assemble

  artifacts:

    paths:

      - opentasks/build/outputs/

      - opentasks/build/outputs/apk/

// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

    repositories {

        google()

        jcenter()

        mavenCentral()

plugins {

    alias(libs.plugins.android.application) apply false

    alias(libs.plugins.android.library) apply false

}

    dependencies {

        classpath 'com.android.tools.build:gradle:4.1.2'

        classpath("com.github.triplet.gradle:play-publisher:2.8.1")

    }

}

def gitVersion = { ->

    def stdout = new ByteArrayOutputStream()

    exec {

        commandLine 'git', 'describe', '--tags', '--always', '--dirty'

        standardOutput = stdout

    }

    return stdout.toString().trim()

}

allprojects {

    version gitVersion()

    repositories {

        google()

        jcenter()

        maven { url "https://jitpack.io" }

        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}

    }

}

apply from: "dependencies.gradle"

def jems_version = '1.43'

def contentpal_version = '0.6'

def androidx_test_runner_version = '1.1.1'

ext.deps = [

        // Support & Google libraries

        support_appcompat  : 'androidx.appcompat:appcompat:1.2.0',

        support_annotations: 'androidx.annotation:annotation:1.1.0',

        support_design     : 'com.google.android.material:material:1.2.1',

        android_dashclock  : 'com.google.android.apps.dashclock:dashclock-api:2.0.0',

        // dmfs

        jems               : "org.dmfs:jems:$jems_version",

        datetime           : 'org.dmfs:rfc5545-datetime:0.2.4',

        lib_recur          : 'org.dmfs:lib-recur:0.12.2',

        xml_magic          : 'org.dmfs:android-xml-magic:0.1.1',

        color_picker       : 'com.github.dmfs:color-picker:1.3',

        android_carrot     : 'com.github.dmfs.androidcarrot:androidcarrot:13edc04',

        bolts_color        : 'com.github.dmfs.Bolts:color-bolts:0.1',

        contentpal         : "com.github.dmfs.contentpal:contentpal:$contentpal_version",

        retention_magic    : 'com.github.dmfs:retention-magic:1.3',

        // 3rd party

        codeka_carrot      : 'au.com.codeka:carrot:2.4.0',

        // Testing

        junit              : 'junit:junit:4.12',

        hamcrest           : 'org.hamcrest:hamcrest-library:1.3',

        mockito            : 'org.mockito:mockito-core:2.27.0',

        robolectric        : 'org.robolectric:robolectric:3.5.1',

        support_test_runner: "androidx.test:runner:$androidx_test_runner_version",

        support_test_rules : "androidx.test:rules:$androidx_test_runner_version",

        // dmfs testing

        jems_testing       : "org.dmfs:jems-testing:$jems_version",

        contenttestpal     : "com.github.dmfs.contentpal:contenttestpal:$contentpal_version",

        contentpal_testing : "com.github.dmfs.contentpal:contentpal-testing:$contentpal_version"

]

 No newline at end of file

COMPILE_SDK_VERSION=29

MIN_SDK_VERSION=21

TARGET_SDK_VERSION=29

VERSION_OVERRIDE=0

org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8

android.enableJetifier=true

android.useAndroidX=true

[versions]

android-carrot = "13edc04"

android-gradle-plugin = "8.13.1"

androidx-test-runner = "1.7.0"

annotation = "1.9.1"

appcompat = "1.7.1"

bolts-color = "0.1"

codeka-carrot = "2.4.5"

color-picker = "1.3"

contentpal = "0.6"

datetime = "0.2.4"

elib = "0.0.1-alpha11"

hamcrest = "3.0"

jems = "1.43"

junit = "4.13.2"

lib-recur = "0.12.2"

material = "1.13.0"

mockito = "5.20.0"

preference = "1.1.1"

recurpicker = "2.1.4"

retention-magic = "1.3"

robolectric = "4.16"

rxandroid = "2.1.1"

rxjava = "2.2.21"

xml-magic = "0.1.1"

[libraries]

android-carrot = { module = "com.github.dmfs.androidcarrot:androidcarrot", version.ref = "android-carrot" }

android-dashclock = { module = "com.google.android.apps.dashclock:dashclock-api", version = "2.0.0" }

bolts-color = { module = "com.github.dmfs.Bolts:color-bolts", version.ref = "bolts-color" }

codeka-carrot = { module = "au.com.codeka:carrot", version.ref = "codeka-carrot" }

color-picker = { module = "com.github.dmfs:color-picker", version.ref = "color-picker" }

contentpal = { module = "com.github.dmfs.contentpal:contentpal", version.ref = "contentpal" }

contentpal-testing = { module = "com.github.dmfs.contentpal:contentpal-testing", version.ref = "contentpal" }

contenttestpal = { module = "com.github.dmfs.contentpal:contenttestpal", version.ref = "contentpal" }

datetime = { module = "org.dmfs:rfc5545-datetime", version.ref = "datetime" }

elib = { module = "foundation.e:elib", version.ref = "elib" }

hamcrest = { module = "org.hamcrest:hamcrest-library", version.ref = "hamcrest" }

jems = { module = "org.dmfs:jems", version.ref = "jems" }

jems-testing = { module = "org.dmfs:jems-testing", version.ref = "jems" }

junit = { module = "junit:junit", version.ref = "junit" }

lib-recur = { module = "org.dmfs:lib-recur", version.ref = "lib-recur" }

material = { module = "com.google.android.material:material", version.ref = "material" }

mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }

preference = { module = "androidx.preference:preference", version.ref = "preference" }

recurpicker = { module = "com.maltaisn:recurpicker", version.ref = "recurpicker" }

retention-magic = { module = "com.github.dmfs:retention-magic", version.ref = "retention-magic" }

robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }

rxandroid = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxandroid" }

rxjava = { module = "io.reactivex.rxjava2:rxjava", version.ref = "rxjava" }

support-annotations = { module = "androidx.annotation:annotation", version.ref = "annotation" }

support-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }

support-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-runner" }

support-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }

xml-magic = { module = "org.dmfs:android-xml-magic", version.ref = "xml-magic" }

[plugins]

android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }

android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }