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

Commit 77b571bf authored by Aayush Gupta's avatar Aayush Gupta Committed by Michael Bestas
Browse files

gradle: Migration and updates 



- Migrate to new plugins and dependency management system
- Migrate to new SDK version properties
- Bump SDK versions to 33
- Drop unused productFlavours block
- Update dependencies

Signed-off-by: default avatarAayush Gupta <aayushgupta219@gmail.com>
Change-Id: I83b7a712cb33ac0c69ea6beec1cd261fdc6f3c0c
parent 35430f9b

app/build.gradle

+9 −9
Original line number Diff line number Diff line 
apply plugin: 'com.android.application'

plugins {

    id 'com.android.application'

}



android {

    compileSdkVersion 31

    compileSdk 33



    defaultConfig {

        applicationId "org.lineageos.recorder"

        minSdkVersion 29

        targetSdkVersion 31

        minSdk 29

        targetSdk 33

        versionCode 1

        versionName "1.1"

    }
@@ -20,12 +22,10 @@ android { 
        sourceCompatibility JavaVersion.VERSION_11

        targetCompatibility JavaVersion.VERSION_11

    }

    productFlavors {

    }

}



dependencies {

    implementation 'androidx.appcompat:appcompat:1.3.1'

    implementation 'com.google.android.material:material:1.4.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'

    implementation 'androidx.appcompat:appcompat:1.5.1'

    implementation 'com.google.android.material:material:1.6.1'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

}

build.gradle

+2 −18
Original line number Diff line number Diff line 
// Top-level build file where you can add configuration options common to all sub-projects/modules.



buildscript {

    repositories {

        mavenCentral()

        google()

    }

    dependencies {

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



        // NOTE: Do not place your application dependencies here; they belong

        // in the individual module build.gradle files

    }

}



allprojects {

    repositories {

        google()

    }

plugins {

    id 'com.android.application' version '7.3.0' apply false

}



task clean(type: Delete) {

gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line 
distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

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

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

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

settings.gradle

+15 −0
Original line number Diff line number Diff line 
pluginManagement {

    repositories {

        gradlePluginPortal()

        google()

        mavenCentral()

    }

}

dependencyResolutionManagement {

    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)

    repositories {

        google()

        mavenCentral()

    }

}

rootProject.name = "Recorder"

include ':app'