diff --git a/app/build.gradle b/app/build.gradle index 2374222fbf..a22e6a9a1a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -100,6 +100,8 @@ def selectableVariants = [ ] android { + namespace 'org.thoughtcrime.securesms' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK @@ -142,12 +144,6 @@ android { } } - lintOptions { - checkReleaseBuilds false - abortOnError true - baseline file("lint-baseline.xml") - disable "LintError" - } sourceSets { test { @@ -164,19 +160,13 @@ android { sourceCompatibility JAVA_VERSION targetCompatibility JAVA_VERSION } - packagingOptions { - exclude 'LICENSE.txt' - exclude 'LICENSE' - exclude 'NOTICE' - exclude 'asm-license.txt' - exclude 'META-INF/LICENSE' - exclude 'META-INF/NOTICE' - exclude 'META-INF/proguard/androidx-annotations.pro' - exclude 'libsignal_jni.dylib' - exclude 'signal_jni.dll' + resources { + excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/NOTICE', 'META-INF/proguard/androidx-annotations.pro', 'libsignal_jni.dylib', 'signal_jni.dll'] + } } + buildFeatures { viewBinding true compose true @@ -410,6 +400,13 @@ android { } } + lint { + abortOnError true + baseline file('lint-baseline.xml') + checkReleaseBuilds false + disable 'LintError' + } + android.applicationVariants.all { variant -> variant.outputs.each { output -> if (output.baseName.contains('nightly')) { diff --git a/app/src/instrumentation/AndroidManifest.xml b/app/src/instrumentation/AndroidManifest.xml index 6c9103481d..93821ec6c5 100644 --- a/app/src/instrumentation/AndroidManifest.xml +++ b/app/src/instrumentation/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java index 0c18dcc164..c082cebf4b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms.giph.ui; +import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.widget.Toast; @@ -55,6 +56,7 @@ public class GiphyActivity extends PassphraseRequiredActivity implements Keyboar dynamicTheme.onCreate(this); } + @SuppressLint("MissingInflatedId") @Override public void onCreate(Bundle bundle, boolean ready) { setContentView(R.layout.giphy_activity); diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupChangeFailureReason.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupChangeFailureReason.java index 732b830306..d0b32e3215 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupChangeFailureReason.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupChangeFailureReason.java @@ -1,5 +1,7 @@ package org.thoughtcrime.securesms.groups.ui; +import android.annotation.SuppressLint; + import androidx.annotation.NonNull; import org.thoughtcrime.securesms.groups.GroupChangeBusyException; @@ -18,6 +20,7 @@ public enum GroupChangeFailureReason { NETWORK, OTHER; + @SuppressLint("SuspiciousIndentation") public static @NonNull GroupChangeFailureReason fromException(@NonNull Throwable e) { if (e instanceof MembershipNotSuitableForV2Exception) return GroupChangeFailureReason.NOT_GV2_CAPABLE; if (e instanceof IOException) return GroupChangeFailureReason.NETWORK; diff --git a/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java b/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java index 5b944b8e90..69256a3371 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java @@ -67,13 +67,14 @@ public final class PlacePickerActivity extends AppCompatActivity { return data.getParcelableExtra(ADDRESS_INTENT); } + @SuppressLint("MissingInflatedId") @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_place_picker); bottomSheet = findViewById(R.id.bottom_sheet); - View markerImage = findViewById(R.id.marker_image_view); + View markerImage = findViewById(R.id.marker_image_view); View fab = findViewById(R.id.place_chosen_button); ViewCompat.setBackgroundTintList(fab, ColorStateList.valueOf(getIntent().getIntExtra(KEY_CHAT_COLOR, Color.RED))); diff --git a/app/src/main/res/layout/alert_view.xml b/app/src/main/res/layout/alert_view.xml index 648f2141d2..02297292c7 100644 --- a/app/src/main/res/layout/alert_view.xml +++ b/app/src/main/res/layout/alert_view.xml @@ -1,7 +1,7 @@ - tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> - tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> - - xmlns:tools="http://schemas.android.com/tools" - tools:viewBindingIgnore="true" + + - tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> - tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> - tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> + - tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> + xmlns:tools="http://schemas.android.com/tools"> - + diff --git a/app/src/pnp/AndroidManifest.xml b/app/src/pnp/AndroidManifest.xml index 6c9103481d..93821ec6c5 100644 --- a/app/src/pnp/AndroidManifest.xml +++ b/app/src/pnp/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> - + + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/core-ui/build.gradle b/core-ui/build.gradle index cfc5538446..f86ebc1dba 100644 --- a/core-ui/build.gradle +++ b/core-ui/build.gradle @@ -1,6 +1,8 @@ apply from: "$rootProject.projectDir/signalModule.gradle" android { + namespace 'org.signal.core.ui' + buildFeatures { compose true } diff --git a/core-ui/src/main/AndroidManifest.xml b/core-ui/src/main/AndroidManifest.xml index 49f27e02e6..7277dc362a 100644 --- a/core-ui/src/main/AndroidManifest.xml +++ b/core-ui/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/core-util/build.gradle b/core-util/build.gradle index a3672b04c7..c9ca7803b4 100644 --- a/core-util/build.gradle +++ b/core-util/build.gradle @@ -6,6 +6,8 @@ plugins { } android { + namespace 'org.signal.core.util' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/core-util/src/main/AndroidManifest.xml b/core-util/src/main/AndroidManifest.xml index 801fdbe4e8..7277dc362a 100644 --- a/core-util/src/main/AndroidManifest.xml +++ b/core-util/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/device-transfer/app/build.gradle b/device-transfer/app/build.gradle index 8af90a2a41..e098a92e45 100644 --- a/device-transfer/app/build.gradle +++ b/device-transfer/app/build.gradle @@ -1,6 +1,8 @@ apply plugin: 'com.android.application' android { + namespace 'org.signal.devicetransfer.app' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/device-transfer/app/src/main/AndroidManifest.xml b/device-transfer/app/src/main/AndroidManifest.xml index 7f077f857a..c5e51b3272 100644 --- a/device-transfer/app/src/main/AndroidManifest.xml +++ b/device-transfer/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/device-transfer/lib/build.gradle b/device-transfer/lib/build.gradle index ffc6d71752..cae32694ff 100644 --- a/device-transfer/lib/build.gradle +++ b/device-transfer/lib/build.gradle @@ -5,6 +5,8 @@ repositories { } android { + namespace 'org.signal.devicetransfer' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/device-transfer/lib/src/main/AndroidManifest.xml b/device-transfer/lib/src/main/AndroidManifest.xml index ad08af0860..091975b220 100644 --- a/device-transfer/lib/src/main/AndroidManifest.xml +++ b/device-transfer/lib/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/donations/app/build.gradle b/donations/app/build.gradle index 5a6ce02287..a9d06d3d27 100644 --- a/donations/app/build.gradle +++ b/donations/app/build.gradle @@ -5,6 +5,8 @@ plugins { } android { + namespace 'org.signal.donations.app' + compileSdk COMPILE_SDK defaultConfig { diff --git a/donations/app/src/main/AndroidManifest.xml b/donations/app/src/main/AndroidManifest.xml index 6b9914619b..0b70efb6b4 100644 --- a/donations/app/src/main/AndroidManifest.xml +++ b/donations/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/glide-config/build.gradle b/glide-config/build.gradle index ce092456fe..70b261547f 100644 --- a/glide-config/build.gradle +++ b/glide-config/build.gradle @@ -5,6 +5,8 @@ plugins { } android { + namespace 'org.signal.glide' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/glide-config/src/main/AndroidManifest.xml b/glide-config/src/main/AndroidManifest.xml index 1d19f23524..8072ee00db 100644 --- a/glide-config/src/main/AndroidManifest.xml +++ b/glide-config/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 34189cc88f..1477d0d5eb 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -502,11 +502,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -515,6 +525,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1315,26 +1333,51 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1350,6 +1393,16 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -1360,36 +1413,71 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1401,6 +1489,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1422,6 +1515,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1430,16 +1531,34 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + @@ -1448,6 +1567,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1456,6 +1583,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1464,6 +1599,19 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + @@ -1477,6 +1625,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1485,6 +1641,22 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + @@ -1493,6 +1665,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -1503,16 +1683,37 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + @@ -1523,46 +1724,91 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1573,6 +1819,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1589,6 +1840,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1605,6 +1861,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1621,6 +1882,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1637,6 +1903,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1677,6 +1948,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -1693,6 +1969,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2113,6 +2394,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2143,6 +2429,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2348,6 +2639,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2358,6 +2654,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -2402,6 +2703,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3073,6 +3379,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3083,6 +3394,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3093,6 +3409,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3103,6 +3424,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3113,11 +3439,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -3128,6 +3464,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3218,51 +3559,101 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3273,6 +3664,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + @@ -3464,6 +3863,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3489,6 +3893,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3509,11 +3918,21 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + + + + + + @@ -3547,6 +3966,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3672,6 +4096,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3757,6 +4186,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3767,6 +4201,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3777,6 +4216,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + @@ -3787,6 +4231,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html + + + + + diff --git a/image-editor/app/build.gradle b/image-editor/app/build.gradle index fc7701d22b..87df661f13 100644 --- a/image-editor/app/build.gradle +++ b/image-editor/app/build.gradle @@ -5,6 +5,8 @@ plugins { } android { + namespace 'org.signal.imageeditor.app' + compileSdk COMPILE_SDK defaultConfig { diff --git a/image-editor/app/src/main/AndroidManifest.xml b/image-editor/app/src/main/AndroidManifest.xml index 2102741cdb..02affe3123 100644 --- a/image-editor/app/src/main/AndroidManifest.xml +++ b/image-editor/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/image-editor/lib/build.gradle b/image-editor/lib/build.gradle index 4e6b8996a1..20045b8a43 100644 --- a/image-editor/lib/build.gradle +++ b/image-editor/lib/build.gradle @@ -4,6 +4,8 @@ plugins { } android { + namespace 'org.signal.imageeditor' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/image-editor/lib/src/main/AndroidManifest.xml b/image-editor/lib/src/main/AndroidManifest.xml index cd18e60eee..a5918e68ab 100644 --- a/image-editor/lib/src/main/AndroidManifest.xml +++ b/image-editor/lib/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + \ No newline at end of file diff --git a/paging/app/build.gradle b/paging/app/build.gradle index 99122ec9a4..1d7e8c1581 100644 --- a/paging/app/build.gradle +++ b/paging/app/build.gradle @@ -1,6 +1,8 @@ apply plugin: 'com.android.application' android { + namespace 'org.signal.pagingtest' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/paging/app/src/main/AndroidManifest.xml b/paging/app/src/main/AndroidManifest.xml index 687310857d..6320a7ca67 100644 --- a/paging/app/src/main/AndroidManifest.xml +++ b/paging/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/photoview/build.gradle b/photoview/build.gradle index 010e1ba692..f5dc4bd487 100644 --- a/photoview/build.gradle +++ b/photoview/build.gradle @@ -6,6 +6,8 @@ plugins { } android { + namespace 'com.github.chrisbanes.photoview' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/photoview/src/main/AndroidManifest.xml b/photoview/src/main/AndroidManifest.xml index e598439623..7277dc362a 100644 --- a/photoview/src/main/AndroidManifest.xml +++ b/photoview/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/qr/app/build.gradle b/qr/app/build.gradle index 09c5998730..f085fd3c85 100644 --- a/qr/app/build.gradle +++ b/qr/app/build.gradle @@ -1,6 +1,8 @@ apply from: "$rootProject.projectDir/signalModuleApp.gradle" android { + namespace 'org.signal.qrtest' + defaultConfig { applicationId "org.signal.qrtest" } diff --git a/qr/app/src/main/AndroidManifest.xml b/qr/app/src/main/AndroidManifest.xml index 3a8aa2c4e8..75433c31d3 100644 --- a/qr/app/src/main/AndroidManifest.xml +++ b/qr/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + xmlns:tools="http://schemas.android.com/tools"> diff --git a/signalModule.gradle b/signalModule.gradle index e16770c92d..66cb20818c 100644 --- a/signalModule.gradle +++ b/signalModule.gradle @@ -22,7 +22,7 @@ android { jvmTarget = '1.8' } - lintOptions { + lint { disable 'InvalidVectorPath' } } diff --git a/sms-exporter/app/build.gradle b/sms-exporter/app/build.gradle index aff7f90af3..06161b997a 100644 --- a/sms-exporter/app/build.gradle +++ b/sms-exporter/app/build.gradle @@ -1,6 +1,8 @@ apply from: "$rootProject.projectDir/signalModuleApp.gradle" android { + namespace 'org.signal.smsexporter.app' + defaultConfig { applicationId "org.signal.smsexporter.app" } diff --git a/sms-exporter/app/src/main/AndroidManifest.xml b/sms-exporter/app/src/main/AndroidManifest.xml index e3bb0ff3e2..131f6d034f 100644 --- a/sms-exporter/app/src/main/AndroidManifest.xml +++ b/sms-exporter/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/sms-exporter/lib/build.gradle b/sms-exporter/lib/build.gradle index e9260ecf94..7884e46171 100644 --- a/sms-exporter/lib/build.gradle +++ b/sms-exporter/lib/build.gradle @@ -1,5 +1,9 @@ apply from: "$rootProject.projectDir/signalModule.gradle" +android { + namespace 'org.signal.smsexporter' +} + dependencies { lintChecks project(':lintchecks') diff --git a/sms-exporter/lib/src/main/AndroidManifest.xml b/sms-exporter/lib/src/main/AndroidManifest.xml index d6da870f81..8bdb7e14b3 100644 --- a/sms-exporter/lib/src/main/AndroidManifest.xml +++ b/sms-exporter/lib/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/spinner/app/build.gradle b/spinner/app/build.gradle index 083ec5efd7..e853520963 100644 --- a/spinner/app/build.gradle +++ b/spinner/app/build.gradle @@ -19,6 +19,8 @@ ktlint { } android { + namespace 'org.signal.spinnertest' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/spinner/app/src/main/AndroidManifest.xml b/spinner/app/src/main/AndroidManifest.xml index a1d79ebcfa..74b3ce4bc8 100644 --- a/spinner/app/src/main/AndroidManifest.xml +++ b/spinner/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/spinner/lib/build.gradle b/spinner/lib/build.gradle index 17b6bd3b0f..8e01f67b1a 100644 --- a/spinner/lib/build.gradle +++ b/spinner/lib/build.gradle @@ -5,6 +5,8 @@ plugins { } android { + namespace 'org.signal.spinner' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/spinner/lib/src/main/AndroidManifest.xml b/spinner/lib/src/main/AndroidManifest.xml index cd8bdc69a9..7277dc362a 100644 --- a/spinner/lib/src/main/AndroidManifest.xml +++ b/spinner/lib/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/sticky-header-grid/build.gradle b/sticky-header-grid/build.gradle index 8c5183c684..5b6100926e 100644 --- a/sticky-header-grid/build.gradle +++ b/sticky-header-grid/build.gradle @@ -6,6 +6,8 @@ plugins { } android { + namespace 'com.codewaves.stickyheadergrid' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/sticky-header-grid/src/main/AndroidManifest.xml b/sticky-header-grid/src/main/AndroidManifest.xml index e2c2c148e3..7277dc362a 100644 --- a/sticky-header-grid/src/main/AndroidManifest.xml +++ b/sticky-header-grid/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/video/build.gradle b/video/build.gradle index b8870f8ea1..f3855f6c5a 100644 --- a/video/build.gradle +++ b/video/build.gradle @@ -1,6 +1,8 @@ apply plugin: 'com.android.library' android { + namespace 'org.signal.video' + buildToolsVersion BUILD_TOOL_VERSION compileSdkVersion COMPILE_SDK diff --git a/video/src/main/AndroidManifest.xml b/video/src/main/AndroidManifest.xml index 99dd357bf8..8072ee00db 100644 --- a/video/src/main/AndroidManifest.xml +++ b/video/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - +