merge upstream changes

2022-09-08 14:56:43 +02:00
parent f073eba538 f531a90b41
commit 8aeda56fc8
23 changed files with 728 additions and 211 deletions
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
 		targetSdk 31
-		versionCode 20
-		versionName '1.1.3+fork.20'
+		versionCode 21
+		versionName '1.1.3+fork.21'
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}

@@ -47,6 +47,10 @@ android {
 			setRoot "src/appcenter"
 		}
 	}
+	lintOptions{
+		checkReleaseBuilds false
+		abortOnError false
+	}
 }

 dependencies {