diff --git a/app/build.gradle b/app/build.gradle
index 2b29951764..b3a2a08158 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -276,10 +276,6 @@ android {
}
}
- sourceSets {
- website.manifest.srcFile 'website/AndroidManifest.xml'
- }
-
lintOptions {
abortOnError true
baseline file("lint-baseline.xml")
@@ -296,73 +292,6 @@ android {
}
}
-/*
-def assembleWebsiteDescriptor = { variant, file ->
- if (file.exists()) {
- MessageDigest md = MessageDigest.getInstance("SHA-256")
- file.eachByte 4096, {bytes, size ->
- md.update(bytes, 0, size)
- }
-
- String digest = md.digest().collect {String.format "%02x", it}.join()
- String url = variant.productFlavors.get(0).ext.websiteUpdateUrl
- String apkName = file.getName()
-
- String descriptor = "{" +
- "\"versionCode\" : $canonicalVersionCode," +
- "\"versionName\" : \"$canonicalVersionName\"," +
- "\"sha256sum\" : \"$digest\"," +
- "\"url\" : \"$url/$apkName\"" +
- "}"
-
- File descriptorFile = new File(file.getParent(), apkName.replace(".apk", ".json"))
-
- descriptorFile.write(descriptor)
- }
-}
-
-def signProductionRelease = { variant ->
- variant.outputs.collect { output ->
- String apkName = output.outputFile.name
- File inputFile = new File(output.outputFile.path)
- File outputFile = new File(output.outputFile.parent, apkName.replace('-unsigned', ''))
-
- new ApkSignerUtil('sun.security.pkcs11.SunPKCS11',
- 'pkcs11.config',
- 'PKCS11',
- 'file:pkcs11.password').calculateSignature(inputFile.getAbsolutePath(),
- outputFile.getAbsolutePath())
-
- inputFile.delete()
- outputFile
- }
-}
-
-task signProductionPlayRelease {
- doLast {
- signProductionRelease(android.applicationVariants.find { (it.name == 'playRelease') })
- }
-}
-
-task signProductionWebsiteRelease {
- doLast {
- def variant = android.applicationVariants.find { (it.name == 'websiteRelease') }
- File signedRelease = signProductionRelease(variant).find { it.name.contains('universal') }
- assembleWebsiteDescriptor(variant, signedRelease)
- }
-}
-
-tasks.whenTaskAdded { task ->
- if (task.name.equals("assemblePlayRelease")) {
- task.finalizedBy signProductionPlayRelease
- }
-
- if (task.name.equals("assembleWebsiteRelease")) {
- task.finalizedBy signProductionWebsiteRelease
- }
-}
- */
-
def getLastCommitTimestamp() {
new ByteArrayOutputStream().withStream { os ->
def result = exec {
diff --git a/app/ic_launcher-web.png b/app/ic_launcher-web.png
deleted file mode 100644
index 82a5d5d97c..0000000000
Binary files a/app/ic_launcher-web.png and /dev/null differ
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 2e4d821e45..67c5988d55 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -5,7 +5,7 @@
id="LintError"
message="Unexpected failure during lint analysis of JobManager.java (this is a bug in lint or one of the libraries it depends on)
Stack: `NullPointerException:ClsFileImpl.getMirror(ClsFileImpl.java:343)←ClsElementImpl.getMirror(ClsElementImpl.java:159)←ClsElementImpl.getText(ClsElementImpl.java:202)←InferenceSession.argConstraints(InferenceSession.java:1817)←InferenceSession.isFunctionalTypeMoreSpecific(InferenceSession.java:1748)←InferenceSession.isFunctionalTypeMoreSpecificOnExpression(InferenceSession.java:1729)←JavaMethodsConflictResolver.isFunctionalTypeMoreSpecific(JavaMethodsConflictResolver.java:779)←JavaMethodsConflictResolver.isTypeMoreSpecific(JavaMethodsConflictResolver.java:673)`
You can set environment variable `LINT_PRINT_STACKTRACE=true` to dump a full stacktrace to stdout.">
+ file="src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java"/>
@@ -25,7 +25,7 @@
errorLine1=" drawables.getColor(1, 0xff000000);"
errorLine2=" ~">
diff --git a/app/website/AndroidManifest.xml b/app/website/AndroidManifest.xml
deleted file mode 100644
index 3dbbbb1dfe..0000000000
--- a/app/website/AndroidManifest.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file