diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8f25ab551..57bdba10e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -46,9 +46,8 @@ android { } lint { - disable("InvalidPeriodicWorkRequestInterval") lintConfig = file("lint.xml") - textOutput("stdout") + textOutput = File("stdout") textReport = true } @@ -98,6 +97,7 @@ android { kotlinOptions { jvmTarget = "1.8" } + flavorDimensions += listOf("store") @Suppress("LocalVariableName") buildTypes { @@ -126,8 +126,6 @@ android { } } - flavorDimensions("store") - productFlavors { create("generic") { dimension = "store" @@ -136,10 +134,13 @@ android { dimension = "store" } } - packagingOptions { - exclude("META-INF/*.kotlin_module") + resources { + excludes += setOf("META-INF/*.kotlin_module") + } } + + namespace = "org.tasks" } configure { diff --git a/app/src/generic/AndroidManifest.xml b/app/src/generic/AndroidManifest.xml index e772685fc..2b327f7a7 100644 --- a/app/src/generic/AndroidManifest.xml +++ b/app/src/generic/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/app/src/googleplay/AndroidManifest.xml b/app/src/googleplay/AndroidManifest.xml index 9f2e9595f..d8cce40af 100644 --- a/app/src/googleplay/AndroidManifest.xml +++ b/app/src/googleplay/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6236a2597..386261d0a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,7 @@ + android:installLocation="internalOnly"> diff --git a/build.gradle.kts b/build.gradle.kts index fe4ae1f92..e64e09b7b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.0.4") + classpath("com.android.tools.build:gradle:7.2.1") classpath("com.google.gms:google-services:4.3.10") classpath("com.google.firebase:firebase-crashlytics-gradle:2.8.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") diff --git a/deps_fdroid.txt b/deps_fdroid.txt index c9006f34d..744b818ab 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,11 +1,11 @@ -++--- androidx.databinding:viewbinding:7.0.4 -> 7.2.0 +++--- androidx.databinding:viewbinding:7.2.1 +| \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 -++--- androidx.databinding:databinding-common:7.0.4 -> 7.2.0 -++--- androidx.databinding:databinding-runtime:7.0.4 -> 7.2.0 +++--- androidx.databinding:databinding-common:7.2.1 +++--- androidx.databinding:databinding-runtime:7.2.1 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 -+| +--- androidx.databinding:databinding-common:7.2.0 -+| +--- androidx.databinding:viewbinding:7.2.0 (*) ++| +--- androidx.databinding:databinding-common:7.2.1 ++| +--- androidx.databinding:viewbinding:7.2.1 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.4.1 +| +--- androidx.arch.core:core-runtime:2.1.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 @@ -16,10 +16,10 @@ +| | \--- androidx.lifecycle:lifecycle-common-java8:2.4.1 (c) +| +--- androidx.arch.core:core-common:2.1.0 (*) +| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 -++--- androidx.databinding:databinding-adapters:7.0.4 -> 7.2.0 -+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) -+| \--- androidx.databinding:databinding-common:7.2.0 -++--- androidx.databinding:databinding-ktx:7.0.4 -> 7.2.0 +++--- androidx.databinding:databinding-adapters:7.2.1 ++| +--- androidx.databinding:databinding-runtime:7.2.1 (*) ++| \--- androidx.databinding:databinding-common:7.2.1 +++--- androidx.databinding:databinding-ktx:7.2.1 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.2 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2 @@ -54,7 +54,7 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.4.1 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.21 (*) -+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) ++| +--- androidx.databinding:databinding-runtime:7.2.1 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.6.10 (*) ++--- com.github.tasks:dav4jvm:deb2c9aef8 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.21 (*) @@ -86,10 +86,10 @@ +| +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava +| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 7.2.1 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.2.1 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.2.1 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.2.1 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 (*) +| +--- androidx.appcompat:appcompat:1.4.1 +| | +--- androidx.annotation:annotation:1.3.0 diff --git a/deps_googleplay.txt b/deps_googleplay.txt index e0f31a910..a7f57a331 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,11 +1,11 @@ -++--- androidx.databinding:viewbinding:7.0.4 -> 7.2.0 +++--- androidx.databinding:viewbinding:7.2.1 +| \--- androidx.annotation:annotation:1.0.0 -> 1.3.0 -++--- androidx.databinding:databinding-common:7.0.4 -> 7.2.0 -++--- androidx.databinding:databinding-runtime:7.0.4 -> 7.2.0 +++--- androidx.databinding:databinding-common:7.2.1 +++--- androidx.databinding:databinding-runtime:7.2.1 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 -+| +--- androidx.databinding:databinding-common:7.2.0 -+| +--- androidx.databinding:viewbinding:7.2.0 (*) ++| +--- androidx.databinding:databinding-common:7.2.1 ++| +--- androidx.databinding:viewbinding:7.2.1 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.4.1 +| +--- androidx.arch.core:core-runtime:2.1.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 @@ -16,10 +16,10 @@ +| | \--- androidx.lifecycle:lifecycle-common-java8:2.4.1 (c) +| +--- androidx.arch.core:core-common:2.1.0 (*) +| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 -++--- androidx.databinding:databinding-adapters:7.0.4 -> 7.2.0 -+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) -+| \--- androidx.databinding:databinding-common:7.2.0 -++--- androidx.databinding:databinding-ktx:7.0.4 -> 7.2.0 +++--- androidx.databinding:databinding-adapters:7.2.1 ++| +--- androidx.databinding:databinding-runtime:7.2.1 (*) ++| \--- androidx.databinding:databinding-common:7.2.1 +++--- androidx.databinding:databinding-ktx:7.2.1 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.2 +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2 @@ -54,7 +54,7 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.4.1 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.21 (*) -+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) ++| +--- androidx.databinding:databinding-runtime:7.2.1 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.6.10 (*) ++--- com.google.firebase:firebase-crashlytics:18.2.8 +| +--- com.google.android.datatransport:transport-api:3.0.0 @@ -263,10 +263,10 @@ +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 (*) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 7.2.1 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.2.1 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.2.1 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.2.1 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 (*) +| +--- androidx.appcompat:appcompat:1.4.1 +| | +--- androidx.annotation:annotation:1.3.0 diff --git a/fastlane/README.md b/fastlane/README.md index ca534776e..0094c54f1 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -1,44 +1,56 @@ fastlane documentation -================ +---- + # Installation Make sure you have the latest version of the Xcode command line tools installed: -``` +```sh xcode-select --install ``` -Install _fastlane_ using -``` -[sudo] gem install fastlane -NV -``` -or alternatively using `brew install fastlane` +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) # Available Actions + ## Android + ### android test + +```sh +[bundle exec] fastlane android test ``` -fastlane android test -``` + Runs all the tests + ### android beta + +```sh +[bundle exec] fastlane android beta ``` -fastlane android beta -``` + Submit a new Beta Build to Crashlytics Beta + ### android deploy + +```sh +[bundle exec] fastlane android deploy ``` -fastlane android deploy -``` + Deploy a new version to the Google Play + ### android lint + +```sh +[bundle exec] fastlane android lint ``` -fastlane android lint -``` + Lint ---- This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. -More information about fastlane can be found on [fastlane.tools](https://fastlane.tools). -The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools). + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 29e413457..669386b87 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.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists