Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d23021d2 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Upgrade Gradle dependencies and target SDK 36

parent b5affca0

build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -2,18 +2,18 @@ 
buildscript {

    repositories {

        google()

        jcenter()

        mavenCentral()

        gradlePluginPortal()

    }

    dependencies {

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

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

    }

}



allprojects {

    repositories {

        google()

        jcenter()

        mavenCentral()

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

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

    }

dependencies.gradle

+9 −9
Original line number Diff line number Diff line 
def jems_version = '1.43'

def contentpal_version = '0.6'

def androidx_test_runner_version = '1.1.1'

def androidx_test_runner_version = '1.7.0'



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',

        support_appcompat  : 'androidx.appcompat:appcompat:1.7.1',

        support_annotations: 'androidx.annotation:annotation:1.9.1',

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

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



        // dmfs
@@ -21,13 +21,13 @@ ext.deps = [ 
        retention_magic    : 'com.github.dmfs:retention-magic:1.3',



        // 3rd party

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

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



        // 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',

        junit              : 'junit:junit:4.13.2',

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

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

        robolectric        : 'org.robolectric:robolectric:4.16',

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

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

gradle.properties

+1 −0
Original line number Diff line number Diff line 
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8

android.enableJetifier=true

android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip

opentasks-contract/build.gradle

+5 −4
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'



android {

    compileSdkVersion 29

    namespace = "org.dmfs.tasks.contract"

    compileSdkVersion 36



    defaultConfig {

        minSdkVersion 21

        targetSdkVersion 29

        targetSdkVersion 36



        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -17,8 +18,8 @@ android { 
        }

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

        sourceCompatibility JavaVersion.VERSION_21

        targetCompatibility JavaVersion.VERSION_21

    }

}