diff --git a/app/build.gradle b/app/build.gradle index de6503b2..61db81f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,17 +69,14 @@ android { } } - lintOptions { - disable 'GoogleAppIndexingWarning' // we don't need Google indexing, thanks - disable 'ImpliedQuantity', 'MissingQuantity' // quantities from Transifex may vary - disable 'MissingTranslation', 'ExtraTranslation' // translations from Transifex are not always up to date - disable 'RtlEnabled', 'RtlHardcoded' // RTL not supported yet - disable 'Typos' - disable 'NullSafeMutableLiveData' // crashes lint since Mar 2021 + lint { + disable 'GoogleAppIndexingWarning', 'ImpliedQuantity', 'MissingQuantity', 'MissingTranslation', 'ExtraTranslation', 'RtlEnabled', 'RtlHardcoded', 'Typos', 'NullSafeMutableLiveData' } packagingOptions { - exclude 'META-INF/*.md' + resources { + excludes += ['META-INF/*.md'] + } } } diff --git a/build.gradle b/build.gradle index f73437ff..0c0ac625 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.1.0' classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" } diff --git a/cert4android b/cert4android index fb38e849..d6c73952 160000 --- a/cert4android +++ b/cert4android @@ -1 +1 @@ -Subproject commit fb38e84944a034850243f317a5dc088532e25b8b +Subproject commit d6c73952bc0a8de125c1128e67d476972bfd8882 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index af7be50b..a0f7639f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ical4android b/ical4android index 04dcf5ca..16eba01b 160000 --- a/ical4android +++ b/ical4android @@ -1 +1 @@ -Subproject commit 04dcf5ca80a1c6f5efc24bda63633ea4d150ddd0 +Subproject commit 16eba01bb255b8fbd3957a3461c3a62ee3374e45 diff --git a/vcard4android b/vcard4android index 816e9596..502f2925 160000 --- a/vcard4android +++ b/vcard4android @@ -1 +1 @@ -Subproject commit 816e95968c0799c93ffa14657aebe6b966d0591d +Subproject commit 502f2925037f3cf8c62e659fbeb52ef460c9b1af