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

Commit 83adcd81 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '0000-s-bump-AGP' into 'main' 

Update AGP to 8.1.0 for Android Studio Giraffe

See merge request !350
parents 14e62e57 ffb74ab4

app/build.gradle

+5 −3
Original line number Diff line number Diff line
@@ -119,17 +119,19 @@ android { 
    }

    buildFeatures {

        viewBinding true

        aidl true

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_11

        targetCompatibility JavaVersion.VERSION_11

        sourceCompatibility JavaVersion.VERSION_17

        targetCompatibility JavaVersion.VERSION_17

    }

    kotlinOptions {

        jvmTarget = '11'

        jvmTarget = '17'

    }

    lint {

        lintConfig file('lint.xml')

    }

    namespace 'foundation.e.apps'

    kotlin.sourceSets.all {

        languageSettings.optIn("kotlin.RequiresOptIn")

    }

app/src/main/AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="foundation.e.apps">

    xmlns:tools="http://schemas.android.com/tools">



    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/foundation/e/apps/AppLoungeApplication.kt

+4 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
package foundation.e.apps



import android.app.Application

import android.os.Build

import android.util.Log

import androidx.annotation.RequiresApi

import androidx.hilt.work.HiltWorkerFactory

import androidx.work.Configuration

import androidx.work.ExistingPeriodicWorkPolicy
@@ -56,13 +58,14 @@ class AppLoungeApplication : Application(), Configuration.Provider { 
    @Inject

    lateinit var preferenceManagerModule: PreferenceManagerModule



    @RequiresApi(Build.VERSION_CODES.TIRAMISU)

    override fun onCreate() {

        super.onCreate()



        InstallWorkManager.context = this

        // Register broadcast receiver for package manager

        val pkgManagerBR = object : PkgManagerBR() {}

        registerReceiver(pkgManagerBR, pkgManagerModule.getFilter())

        registerReceiver(pkgManagerBR, pkgManagerModule.getFilter(), RECEIVER_EXPORTED)



        val currentVersion = dataStoreModule.getTOSVersion()

        if (!currentVersion.contentEquals(TOS_VERSION)) {

build.gradle

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



plugins {

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

    id 'com.android.library' version '7.4.0' apply false

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

    id 'com.android.library' version '8.1.0' apply false

    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false

    id 'com.google.dagger.hilt.android' version '2.44' apply false

    id "org.jetbrains.kotlin.plugin.allopen" version "1.8.0"

gradle.properties

+4 −1
Original line number Diff line number Diff line
@@ -19,3 +19,6 @@ android.useAndroidX=true 
android.enableJetifier=true

# Kotlin code style for this project: "official" or "obsolete":

kotlin.code.style=official

android.defaults.buildfeatures.buildconfig=true

android.nonTransitiveRClass=false

android.nonFinalResIds=false
 
 No newline at end of file