Merge branch 'upstream' into fork

mastodon/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 android {
-	compileSdk 31
+	compileSdk 33
 	defaultConfig {
 		applicationId "org.joinmastodon.android.sk"
 		minSdk 23
-		targetSdk 31
-		versionCode 21
-		versionName '1.1.3+fork.21'
+		targetSdk 33
+		versionCode 22
+		versionName "1.1.3+fork.22"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 	}
 
@@ -33,6 +33,9 @@ android {
 			initWith release
 			versionNameSuffix "-beta"
 		}
+		githubRelease{
+			initWith release
+		}
 	}
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_17
@@ -46,6 +49,9 @@ android {
 		appcenterPublicBeta{
 			setRoot "src/appcenter"
 		}
+		githubRelease{
+			setRoot "src/github"
+		}
 	}
 	lintOptions{
 		checkReleaseBuilds false