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

Commit 7e1f4e28 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-23.0' into a16

parents d935a474 ac959a53

app/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ android_app { 
        "androidx.recyclerview_recyclerview",

        "androidx.recyclerview_recyclerview-selection",

        "com.google.android.material_material",

        "kotlin-stdlib-jdk8",

        "kotlin-stdlib",

    ],



    sdk_version: "35",

    sdk_version: "36",



    optimize: {

        optimize: true,

app/build.gradle.kts

+8 −5
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * SPDX-License-Identifier: Apache-2.0

 */



import org.jetbrains.kotlin.gradle.dsl.JvmTarget

import org.lineageos.generatebp.GenerateBpPluginExtension

import org.lineageos.generatebp.models.Module
@@ -13,13 +14,13 @@ plugins { 
}



android {

    compileSdk = 35

    compileSdk = 36

    namespace = "org.lineageos.recorder"



    defaultConfig {

        applicationId = "org.lineageos.recorder"

        minSdk = 31

        targetSdk = 35

        targetSdk = 36

        versionCode = 1

        versionName = "1.1"

    }
@@ -48,14 +49,16 @@ android { 
        targetCompatibility = JavaVersion.VERSION_1_8

    }



    kotlinOptions {

        jvmTarget = "1.8"

    kotlin {

        compilerOptions {

            jvmTarget.set(JvmTarget.JVM_1_8)

        }

    }

}



dependencies {

    // Align versions of all Kotlin components

    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))

    implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.1.10"))



    implementation("androidx.activity:activity-ktx:1.7.2")

    implementation("androidx.appcompat:appcompat:1.6.1")

build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 


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

plugins {

    id("com.android.application") version "8.7.2" apply false

    id("org.jetbrains.kotlin.android") version "1.7.10" apply false

    id("com.android.application") version "8.13.0" apply false

    id("org.jetbrains.kotlin.android") version "2.1.10" apply false

    id("org.lineageos.generatebp") version "+" apply false

}

gradle/wrapper/gradle-wrapper.jar

+1.83 KiB (44.4 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

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-8.10-bin.zip

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

networkTimeout=10000

validateDistributionUrl=true

zipStoreBase=GRADLE_USER_HOME