diff options
author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-07-28 06:04:25 +0000 |
---|---|---|
committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-07-28 06:04:25 +0000 |
commit | 12510a55c9c2b1d21c6e1f45d0058778ddfc9eaa (patch) | |
tree | f87e29f670323b7173e5e3875112271c8835a5d3 /build.gradle | |
parent | 3ca73e64ddd25c7c20eca2e4e0db77032db848c0 (diff) | |
parent | b4d35c1c12120503e74d7ae99edd94302673acf6 (diff) |
Merge branch 'remove_flow_mvi' into 'main'
#5444 Fix CPU consumption - remove flow-mvi dependency
See merge request e/os/advanced-privacy!74
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index a6f458d..2442f01 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,9 @@ import foundation.e.privacycentral.buildsrc.ReleaseType // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.buildConfig = [ - 'compileSdk': 29, + 'compileSdk': 31, 'minSdk' : 26, - 'targetSdk' : 29, + 'targetSdk' : 30, 'version' : [ 'major': 1, 'minor': 1, @@ -31,7 +31,7 @@ buildscript { dependencies { classpath Libs.androidGradlePlugin - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -44,6 +44,16 @@ plugins { } allprojects { + //Support @JvmDefault, and @OptIn + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + freeCompilerArgs = ['-Xjvm-default=enable', '-opt-in=kotlin.RequiresOptIn'] + + + jvmTarget = "1.8" + } + } + repositories { google() mavenCentral() |