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

Commit 30bad3e6 authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Update gradle version

parent b5eacdde

build.gradle

+3 −11
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 {

    ext.kotlin_version = "1.4.10"

    ext.kotlin_version = "1.5.20"

    repositories {

        google()

        mavenCentral()

    }

    dependencies {

        classpath "com.android.tools.build:gradle:4.0.1"

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"

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

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"



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

        // in the individual module build.gradle files

    }

}



allprojects {

    repositories {

        google()

        mavenCentral()

        mavenLocal()

    }

}



task clean(type: Delete) {

    delete rootProject.buildDir

}
 
 No newline at end of file

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.1.1-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

privacymodulese/build.gradle

+6 −11
Original line number Diff line number Diff line
@@ -9,10 +9,7 @@ android { 
    defaultConfig {

        minSdkVersion 24

        targetSdkVersion 29

        versionCode 3

        versionName "0.1.2"



        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        consumerProguardFiles "consumer-rules.pro"

    }
@@ -22,19 +19,17 @@ android { 
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

        }

    }

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }

}



dependencies {

    implementation 'foundation.e:privacymodule.api:0.3.1'



    implementation fileTree(dir: "libs", include: ["*.jar"])

    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

    implementation 'androidx.core:core-ktx:1.3.2'

    implementation 'androidx.appcompat:appcompat:1.2.0'

    testImplementation 'junit:junit:4.12'

    androidTestImplementation 'androidx.test.ext:junit:1.1.2'

    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'



    implementation 'androidx.core:core-ktx:1.6.0'

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

}



publishing {

privacymodulese/src/main/java/foundation/e/privacymodules/permissions/PermissionsPrivacyModule.kt

+1 −3
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ import android.net.IConnectivityManager 
import android.os.ServiceManager

import android.os.UserHandle

import android.util.Log

import android.widget.Toast

import androidx.appcompat.app.AppCompatActivity

import foundation.e.privacymodules.commons.ManualAction

import foundation.e.privacymodules.permissions.data.AppOpModes

import foundation.e.privacymodules.permissions.data.ApplicationDescription
@@ -20,7 +18,7 @@ import java.util.* 
class PermissionsPrivacyModule(context: Context): APermissionsPrivacyModule(context) {



    private val appOpsManager: AppOpsManager get()

        = context.getSystemService(AppCompatActivity.APP_OPS_SERVICE) as AppOpsManager

        = context.getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager



    /**

     * @see IPermissionsPrivacyModule.toggleDangerousPermission

settings.gradle

+9 −0
Original line number Diff line number Diff line 
dependencyResolutionManagement {

    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)

    repositories {

        google()

        mavenCentral()

        mavenLocal()

    }

}



include ':privacymodulese'



rootProject.name = "PrivacyModulesE"