archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update AGP

Browse Source
pull/1905/head
Alex Baker 4 years ago
parent ead0255bbb
commit 151dc36165
9 changed files with 69 additions and 59 deletions
Show Stats Download Patch File Download Diff File

13
app/build.gradle.kts
Unescape Escape View File

@ -46,9 +46,8 @@ android {
} }
lint { lint {
disable("InvalidPeriodicWorkRequestInterval")
lintConfig = file("lint.xml") lintConfig = file("lint.xml")
textOutput("stdout") textOutput = File("stdout")
textReport = true textReport = true
} }
@ -98,6 +97,7 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "1.8"
} }
flavorDimensions += listOf("store")
@Suppress("LocalVariableName") @Suppress("LocalVariableName")
buildTypes { buildTypes {
@ -126,8 +126,6 @@ android {
} }
} }
flavorDimensions("store")
productFlavors { productFlavors {
create("generic") { create("generic") {
dimension = "store" dimension = "store"
@ -136,10 +134,13 @@ android {
dimension = "store" dimension = "store"
} }
} }
packagingOptions { packagingOptions {
exclude("META-INF/*.kotlin_module") resources {
excludes += setOf("META-INF/*.kotlin_module")
}
} }
namespace = "org.tasks"
} }
configure<CheckstyleExtension> { configure<CheckstyleExtension> {

3
app/src/generic/AndroidManifest.xml
Unescape Escape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest <manifest>
package="org.tasks">
<application/> <application/>

3
app/src/googleplay/AndroidManifest.xml
Unescape Escape View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="org.tasks">
<application tools:ignore="GoogleAppIndexingWarning"> <application tools:ignore="GoogleAppIndexingWarning">

3
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -2,8 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="org.tasks" android:installLocation="internalOnly">
android:installLocation="internalOnly">
<!-- ================================================== Used Permissions = --> <!-- ================================================== Used Permissions = -->

2
build.gradle.kts
Unescape Escape View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { 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.gms:google-services:4.3.10")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.8.1") classpath("com.google.firebase:firebase-crashlytics-gradle:2.8.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")

28
deps_fdroid.txt
Unescape Escape View File

@ -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.annotation:annotation:1.0.0 -> 1.3.0
++--- androidx.databinding:databinding-common:7.0.4 -> 7.2.0 ++--- androidx.databinding:databinding-common:7.2.1
++--- androidx.databinding:databinding-runtime:7.0.4 -> 7.2.0 ++--- androidx.databinding:databinding-runtime:7.2.1
+| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+| +--- androidx.databinding:databinding-common:7.2.0 +| +--- androidx.databinding:databinding-common:7.2.1
+| +--- androidx.databinding:viewbinding:7.2.0 (*) +| +--- androidx.databinding:viewbinding:7.2.1 (*)
+| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.4.1 +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.4.1
+| +--- androidx.arch.core:core-runtime:2.1.0 +| +--- androidx.arch.core:core-runtime:2.1.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
@ -16,10 +16,10 @@
+| | \--- androidx.lifecycle:lifecycle-common-java8:2.4.1 (c) +| | \--- androidx.lifecycle:lifecycle-common-java8:2.4.1 (c)
+| +--- androidx.arch.core:core-common:2.1.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 (*)
+| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
++--- androidx.databinding:databinding-adapters:7.0.4 -> 7.2.0 ++--- androidx.databinding:databinding-adapters:7.2.1
+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) +| +--- androidx.databinding:databinding-runtime:7.2.1 (*)
+| \--- androidx.databinding:databinding-common:7.2.0 +| \--- androidx.databinding:databinding-common:7.2.1
++--- androidx.databinding:databinding-ktx:7.0.4 -> 7.2.0 ++--- androidx.databinding:databinding-ktx:7.2.1
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.2 +| +--- 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:1.5.2
+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm: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.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.4.1
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.21 (*) +| | \--- 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 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.6.10 (*)
++--- com.github.tasks:dav4jvm:deb2c9aef8 ++--- com.github.tasks:dav4jvm:deb2c9aef8
+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.6.21 (*) +| +--- 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 +| +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
+| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
++--- com.github.bitfireAT:cert4android:7814052 ++--- com.github.bitfireAT:cert4android:7814052
+| +--- androidx.databinding:databinding-common:7.2.0 +| +--- androidx.databinding:databinding-common:7.2.0 -> 7.2.1
+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) +| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.2.1 (*)
+| +--- androidx.databinding:databinding-adapters:7.2.0 (*) +| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.2.1 (*)
+| +--- androidx.databinding:databinding-ktx:7.2.0 (*) +| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.2.1 (*)
+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 (*)
+| +--- androidx.appcompat:appcompat:1.4.1 +| +--- androidx.appcompat:appcompat:1.4.1
+| | +--- androidx.annotation:annotation:1.3.0 +| | +--- androidx.annotation:annotation:1.3.0

28
deps_googleplay.txt
Unescape Escape View File

@ -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.annotation:annotation:1.0.0 -> 1.3.0
++--- androidx.databinding:databinding-common:7.0.4 -> 7.2.0 ++--- androidx.databinding:databinding-common:7.2.1
++--- androidx.databinding:databinding-runtime:7.0.4 -> 7.2.0 ++--- androidx.databinding:databinding-runtime:7.2.1
+| +--- androidx.collection:collection:1.0.0 -> 1.1.0 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+| +--- androidx.databinding:databinding-common:7.2.0 +| +--- androidx.databinding:databinding-common:7.2.1
+| +--- androidx.databinding:viewbinding:7.2.0 (*) +| +--- androidx.databinding:viewbinding:7.2.1 (*)
+| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.4.1 +| \--- androidx.lifecycle:lifecycle-runtime:2.2.0 -> 2.4.1
+| +--- androidx.arch.core:core-runtime:2.1.0 +| +--- androidx.arch.core:core-runtime:2.1.0
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
@ -16,10 +16,10 @@
+| | \--- androidx.lifecycle:lifecycle-common-java8:2.4.1 (c) +| | \--- androidx.lifecycle:lifecycle-common-java8:2.4.1 (c)
+| +--- androidx.arch.core:core-common:2.1.0 (*) +| +--- androidx.arch.core:core-common:2.1.0 (*)
+| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| \--- androidx.annotation:annotation:1.1.0 -> 1.3.0
++--- androidx.databinding:databinding-adapters:7.0.4 -> 7.2.0 ++--- androidx.databinding:databinding-adapters:7.2.1
+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) +| +--- androidx.databinding:databinding-runtime:7.2.1 (*)
+| \--- androidx.databinding:databinding-common:7.2.0 +| \--- androidx.databinding:databinding-common:7.2.1
++--- androidx.databinding:databinding-ktx:7.0.4 -> 7.2.0 ++--- androidx.databinding:databinding-ktx:7.2.1
+| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.2 +| +--- 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:1.5.2
+| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm: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.lifecycle:lifecycle-viewmodel:2.2.0 -> 2.4.1
+| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.1.0 -> 1.3.0
+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.6.21 (*) +| | \--- 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 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31 -> 1.6.10 (*)
++--- com.google.firebase:firebase-crashlytics:18.2.8 ++--- com.google.firebase:firebase-crashlytics:18.2.8
+| +--- com.google.android.datatransport:transport-api:3.0.0 +| +--- com.google.android.datatransport:transport-api:3.0.0
@ -263,10 +263,10 @@
+| | \--- org.slf4j:slf4j-api:1.7.30 +| | \--- org.slf4j:slf4j-api:1.7.30
+| \--- androidx.core:core-ktx:1.3.2 (*) +| \--- androidx.core:core-ktx:1.3.2 (*)
++--- com.github.bitfireAT:cert4android:7814052 ++--- com.github.bitfireAT:cert4android:7814052
+| +--- androidx.databinding:databinding-common:7.2.0 +| +--- androidx.databinding:databinding-common:7.2.0 -> 7.2.1
+| +--- androidx.databinding:databinding-runtime:7.2.0 (*) +| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.2.1 (*)
+| +--- androidx.databinding:databinding-adapters:7.2.0 (*) +| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.2.1 (*)
+| +--- androidx.databinding:databinding-ktx:7.2.0 (*) +| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.2.1 (*)
+| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 (*)
+| +--- androidx.appcompat:appcompat:1.4.1 +| +--- androidx.appcompat:appcompat:1.4.1
+| | +--- androidx.annotation:annotation:1.3.0 +| | +--- androidx.annotation:annotation:1.3.0

46
fastlane/README.md
Unescape Escape View File

@ -1,44 +1,56 @@
fastlane documentation fastlane documentation
================ ----
# Installation # Installation
Make sure you have the latest version of the Xcode command line tools installed: Make sure you have the latest version of the Xcode command line tools installed:
``` ```sh
xcode-select --install xcode-select --install
``` ```
Install _fastlane_ using For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
```
[sudo] gem install fastlane -NV
```
or alternatively using `brew install fastlane`
# Available Actions # Available Actions
## Android ## Android
### android test ### android test
```sh
[bundle exec] fastlane android test
``` ```
fastlane android test
```
Runs all the tests Runs all the tests
### android beta ### android beta
```sh
[bundle exec] fastlane android beta
``` ```
fastlane android beta
```
Submit a new Beta Build to Crashlytics Beta Submit a new Beta Build to Crashlytics Beta
### android deploy ### android deploy
```sh
[bundle exec] fastlane android deploy
``` ```
fastlane android deploy
```
Deploy a new version to the Google Play Deploy a new version to the Google Play
### android lint ### android lint
```sh
[bundle exec] fastlane android lint
``` ```
fastlane android lint
```
Lint Lint
---- ----
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. 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).

2
gradle/wrapper/gradle-wrapper.properties vendored
Unescape Escape View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Write Preview
Loading…
Cancel
Save