Skip to content

briar
briar
Commit b68dbd6a authored by akwizgran's avatar akwizgran
Browse files
Options

Merge branch 'upgrade-dependencies' into 'master' 

Upgrade some of the things

See merge request briar/briar!935
parents a030f922 4d08c697
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 166 deletions
bramble-android/build.gradle
View file @ b68dbd6a
......@@ -3,8 +3,8 @@ apply plugin: 'witness'
apply from: 'witness.gradle'
android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 14
......
bramble-android/witness.gradle
View file @ b68dbd6a
This diff is collapsed.
bramble-core/build.gradle
View file @ b68dbd6a
......@@ -14,7 +14,7 @@ dependencies {
implementation 'com.h2database:h2:1.4.192' // The last version that supports Java 1.6
implementation 'org.bitlet:weupnp:0.1.4'
implementation 'net.i2p.crypto:eddsa:0.2.0'
implementation 'org.whispersystems:curve25519-java:0.4.1'
implementation 'org.whispersystems:curve25519-java:0.5.0'
implementation 'org.briarproject:jtorctl:0.3'
apt 'com.google.dagger:dagger-compiler:2.0.2'
......
bramble-core/witness.gradle
View file @ b68dbd6a
......@@ -28,6 +28,6 @@ dependencyVerification {
'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
'org.ow2.asm:asm-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d',
'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
'org.whispersystems:curve25519-java:0.4.1:curve25519-java-0.4.1.jar:7dd659d8822c06c3aea1a47f18fac9e5761e29cab8100030b877db445005f03e',
'org.whispersystems:curve25519-java:0.5.0:curve25519-java-0.5.0.jar:0aadd43cf01d11e9b58f867b3c4f25c3194e8b0623d1953d32dfbfbee009e38d',
]
}
bramble-java/build.gradle
View file @ b68dbd6a
......@@ -14,8 +14,8 @@ configurations {
dependencies {
implementation project(path: ':bramble-core', configuration: 'default')
implementation fileTree(dir: 'libs', include: '*.jar')
implementation 'net.java.dev.jna:jna:4.4.0'
implementation 'net.java.dev.jna:jna-platform:4.4.0'
implementation 'net.java.dev.jna:jna:4.5.2'
implementation 'net.java.dev.jna:jna-platform:4.5.2'
tor 'org.briarproject:tor:0.2.9.16@zip'
apt 'com.google.dagger:dagger-compiler:2.0.2'
......
bramble-java/witness.gradle
View file @ b68dbd6a
......@@ -7,8 +7,8 @@ dependencyVerification {
'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
'net.java.dev.jna:jna-platform:4.4.0:jna-platform-4.4.0.jar:e9dda9e884fc107eb6367710540789a12dfa8ad28be9326b22ca6e352e325499',
'net.java.dev.jna:jna:4.4.0:jna-4.4.0.jar:c4dadeeecaa90c8847902082aee5eb107fcf59c5d0e63a17fcaf273c0e2d2bd1',
'net.java.dev.jna:jna-platform:4.5.2:jna-platform-4.5.2.jar:f1d00c167d8921c6e23c626ef9f1c3ae0be473c95c68ffa012bc7ae55a87e2d6',
'net.java.dev.jna:jna:4.5.2:jna-4.5.2.jar:0c8eb7acf67261656d79005191debaba3b6bf5dd60a43735a245429381dbecff',
'org.apache.ant:ant-launcher:1.9.4:ant-launcher-1.9.4.jar:7bccea20b41801ca17bcbc909a78c835d0f443f12d639c77bd6ae3d05861608d',
'org.apache.ant:ant:1.9.4:ant-1.9.4.jar:649ae0730251de07b8913f49286d46bba7b92d47c5f332610aa426c4f02161d8',
'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8',
......
briar-android/build.gradle
View file @ b68dbd6a
......@@ -17,7 +17,7 @@ def getStdout = { command, defaultValue ->
android {
compileSdkVersion 28
buildToolsVersion '28.0.2'
buildToolsVersion '28.0.3'
defaultConfig {
minSdkVersion 15
......@@ -90,7 +90,7 @@ dependencies {
implementation project(path: ':bramble-core', configuration: 'default')
implementation project(':bramble-android')
def supportVersion = '27.1.1'
def supportVersion = '28.0.0'
implementation "com.android.support:support-v4:$supportVersion"
implementation("com.android.support:appcompat-v7:$supportVersion") {
exclude module: 'support-v4'
......@@ -106,15 +106,15 @@ dependencies {
implementation "com.android.support:support-annotations:$supportVersion"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation('ch.acra:acra:4.9.1') {
implementation('ch.acra:acra:4.11') {
exclude module: 'support-v4'
exclude module: 'support-annotations'
}
implementation 'info.guardianproject.panic:panic:0.5'
implementation 'info.guardianproject.trustedintents:trustedintents:0.2'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'com.google.zxing:core:3.3.0'
implementation 'uk.co.samuelwall:material-tap-target-prompt:2.8.0'
implementation 'com.google.zxing:core:3.3.3'
implementation 'uk.co.samuelwall:material-tap-target-prompt:2.12.4'
implementation 'com.vanniktech:emoji-google:0.5.1'
annotationProcessor 'com.google.dagger:dagger-compiler:2.0.2'
......
briar-android/proguard-rules.txt
View file @ b68dbd6a
......@@ -19,6 +19,8 @@
-dontnote com.android.org.conscrypt.SSLParametersImpl
-dontnote org.apache.harmony.xnet.provider.jsse.SSLParametersImpl
-dontnote sun.security.ssl.SSLContextImpl
-dontwarn org.conscrypt.OpenSSLProvider
-dontwarn org.conscrypt.Conscrypt
# HTML sanitiser
-keep class org.jsoup.safety.Whitelist
......
briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java
View file @ b68dbd6a
......@@ -6,7 +6,6 @@ import android.support.annotation.NonNull;
import org.acra.collector.CrashReportData;
import org.acra.sender.ReportSender;
import org.acra.sender.ReportSenderException;
import org.acra.util.JSONReportBuilder.JSONReportException;
import org.briarproject.bramble.api.reporting.DevReporter;
import org.briarproject.bramble.util.AndroidUtils;
import org.briarproject.briar.android.AndroidComponent;
......@@ -34,12 +33,7 @@ public class BriarReportSender implements ReportSender {
@NonNull CrashReportData errorContent)
throws ReportSenderException {
component.inject(this);
String crashReport;
try {
crashReport = errorContent.toJSON().toString();
} catch (JSONReportException e) {
throw new ReportSenderException("Couldn't create JSON", e);
}
String crashReport = errorContent.toJSON().toString();
try {
File reportDir = AndroidUtils.getReportDir(ctx);
String reportId = errorContent.getProperty(REPORT_ID);
......
briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
View file @ b68dbd6a
......@@ -24,9 +24,11 @@ import org.acra.ReportField;
import org.acra.collector.CrashReportData;
import org.acra.dialog.BaseCrashReportDialog;
import org.acra.file.CrashReportPersister;
import org.acra.model.Element;
import org.briarproject.briar.R;
import org.briarproject.briar.android.Localizer;
import org.briarproject.briar.android.util.UserFeedback;
import org.json.JSONException;
import java.io.File;
import java.io.IOException;
......@@ -282,7 +284,7 @@ public class DevReportActivity extends BaseCrashReportDialog
CrashReportPersister persister = new CrashReportPersister();
try {
return persister.load(reportFile);
} catch (IOException e) {
} catch (IOException | JSONException e) {
LOG.log(WARNING, "Could not load report file", e);
return null;
}
......@@ -292,9 +294,10 @@ public class DevReportActivity extends BaseCrashReportDialog
protected void onPostExecute(CrashReportData crashData) {
LayoutInflater inflater = getLayoutInflater();
if (crashData != null) {
for (Entry<ReportField, String> e : crashData.entrySet()) {
for (Entry<ReportField, Element> e : crashData.entrySet()) {
ReportField field = e.getKey();
String value = e.getValue().replaceAll("\\\\n", "\n");
String value = e.getValue().toString()
.replaceAll("\\\\n", "\n");
boolean required = requiredFields.contains(field);
boolean excluded = excludedFields.contains(field);
View v = inflater.inflate(R.layout.list_item_crash,
......@@ -343,10 +346,10 @@ public class DevReportActivity extends BaseCrashReportDialog
data.remove(field);
}
} else {
Iterator<Entry<ReportField, String>> iter =
Iterator<Entry<ReportField, Element>> iter =
data.entrySet().iterator();
while (iter.hasNext()) {
Entry<ReportField, String> e = iter.next();
Entry<ReportField, Element> e = iter.next();
if (!requiredFields.contains(e.getKey())) {
iter.remove();
}
......@@ -354,7 +357,7 @@ public class DevReportActivity extends BaseCrashReportDialog
}
persister.store(data, reportFile);
return true;
} catch (IOException e) {
} catch (IOException | JSONException e) {
LOG.log(WARNING, "Error processing report file", e);
return false;
}
......
briar-android/src/main/res/xml/panic_preferences.xml
View file @ b68dbd6a
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_lock"
android:summary="@string/panic_setting_signout_summary"
android:title="@string/panic_setting_signout_title"/>
android:title="@string/panic_setting_signout_title"
app:iconSpaceReserved="false"/>
<PreferenceCategory
android:layout="@layout/preferences_category"
......@@ -23,7 +25,8 @@
android:enabled="false"
android:key="pref_key_purge"
android:summary="@string/purge_setting_summary"
android:title="@string/purge_setting_title"/>
android:title="@string/purge_setting_title"
app:iconSpaceReserved="false"/>
</PreferenceCategory>
......
briar-android/src/main/res/xml/settings.xml
View file @ b68dbd6a
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/display_settings_title">
......@@ -10,7 +11,8 @@
android:entryValues="@array/pref_language_values"
android:key="pref_key_language"
android:summary="%s"
android:title="@string/pref_language_title"/>
android:title="@string/pref_language_title"
app:iconSpaceReserved="false"/>
<ListPreference
android:defaultValue="@string/pref_theme_light_value"
......@@ -18,8 +20,9 @@
android:entryValues="@array/pref_theme_values"
android:key="pref_key_theme"
android:summary="%s"
android:title="@string/pref_theme_title"/>
android:title="@string/pref_theme_title"
app:iconSpaceReserved="false"/>
</PreferenceCategory>
<PreferenceCategory
......@@ -33,7 +36,8 @@
android:key="pref_key_bluetooth"
android:persistent="false"
android:summary="%s"
android:title="@string/bluetooth_setting"/>
android:title="@string/bluetooth_setting"
app:iconSpaceReserved="false"/>
<ListPreference
android:defaultValue="0"
......@@ -42,14 +46,16 @@
android:key="pref_key_tor_network"
android:persistent="false"
android:summary="%s"
android:title="@string/tor_network_setting"/>
android:title="@string/tor_network_setting"
app:iconSpaceReserved="false"/>
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_tor_mobile_data"
android:persistent="false"
android:title="@string/tor_mobile_data_title"
android:widgetLayout="@layout/preference_switch_compat"/>
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
</PreferenceCategory>
......@@ -63,7 +69,8 @@
android:persistent="false"
android:summary="@string/pref_lock_summary"
android:title="@string/pref_lock_title"
android:widgetLayout="@layout/preference_switch_compat"/>
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<ListPreference
android:defaultValue="@string/pref_lock_timeout_value_default"
......@@ -73,11 +80,13 @@
android:key="pref_key_lock_timeout"
android:persistent="false"
android:summary="@string/pref_lock_timeout_summary"
android:title="@string/pref_lock_timeout_title"/>
android:title="@string/pref_lock_timeout_title"
app:iconSpaceReserved="false"/>
<Preference
android:key="pref_key_change_password"
android:title="@string/change_password">
android:title="@string/change_password"
app:iconSpaceReserved="false">
<intent
android:targetClass="org.briarproject.briar.android.login.ChangePasswordActivity"
......@@ -92,7 +101,8 @@
<Preference
android:summary="@string/panic_setting_hint"
android:title="@string/panic_setting">
android:title="@string/panic_setting"
app:iconSpaceReserved="false">
<intent
android:targetClass="org.briarproject.briar.android.panic.PanicPreferencesActivity"
......@@ -111,7 +121,8 @@
android:key="pref_key_notify_sign_in"
android:summary="@string/notify_sign_in_summary"
android:title="@string/notify_sign_in_title"
android:widgetLayout="@layout/preference_switch_compat"/>
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference
android:defaultValue="true"
......@@ -119,7 +130,8 @@
android:persistent="false"
android:summary="@string/notify_private_messages_setting_summary"
android:title="@string/notify_private_messages_setting_title"
android:widgetLayout="@layout/preference_switch_compat"/>
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference
android:defaultValue="true"
......@@ -127,7 +139,8 @@
android:persistent="false"
android:summary="@string/notify_group_messages_setting_summary"
android:title="@string/notify_group_messages_setting_title"
android:widgetLayout="@layout/preference_switch_compat"/>
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference
android:defaultValue="true"
......@@ -135,7 +148,8 @@
android:persistent="false"
android:summary="@string/notify_forum_posts_setting_summary"
android:title="@string/notify_forum_posts_setting_title"
android:widgetLayout="@layout/preference_switch_compat"/>
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference
android:defaultValue="true"
......@@ -143,28 +157,34 @@
android:persistent="false"
android:summary="@string/notify_blog_posts_setting_summary"
android:title="@string/notify_blog_posts_setting_title"
android:widgetLayout="@layout/preference_switch_compat"/>
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<SwitchPreference
android:defaultValue="true"
android:key="pref_key_notify_vibration"
android:persistent="false"
android:title="@string/notify_vibration_setting"
android:widgetLayout="@layout/preference_switch_compat"/>
android:widgetLayout="@layout/preference_switch_compat"
app:iconSpaceReserved="false"/>
<Preference
android:key="pref_key_notify_sound"
android:title="@string/notify_sound_setting"/>
android:title="@string/notify_sound_setting"
app:iconSpaceReserved="false"/>
</PreferenceCategory>
<PreferenceCategory
android:layout="@layout/preferences_category"
android:title="@string/feedback_settings_title"/>
android:title="@string/feedback_settings_title">
<Preference
android:key="pref_key_send_feedback"
android:title="@string/send_feedback"
app:iconSpaceReserved="false"/>
<Preference
android:key="pref_key_send_feedback"
android:title="@string/send_feedback"/>
</PreferenceCategory>
<PreferenceCategory
android:layout="@layout/preferences_category"
......@@ -172,7 +192,8 @@
<Preference
android:key="pref_key_test_data"
android:title="Create Test Data">
android:title="Create Test Data"
app:iconSpaceReserved="false">
<intent
android:targetClass="org.briarproject.briar.android.test.TestDataActivity"
......@@ -181,7 +202,8 @@
<Preference
android:key="pref_key_explode"
android:title="Crash"/>
android:title="Crash"
app:iconSpaceReserved="false"/>
</PreferenceCategory>
......
briar-android/witness.gradle
View file @ b68dbd6a
This diff is collapsed.
briar-core/build.gradle
View file @ b68dbd6a
......@@ -10,10 +10,10 @@ apply from: 'witness.gradle'
dependencies {
implementation project(path: ':briar-api', configuration: 'default')
implementation 'com.rometools:rome:1.7.3'
implementation 'com.rometools:rome:1.10.0'
implementation 'org.jdom:jdom2:2.0.6'
implementation 'com.squareup.okhttp3:okhttp:3.8.0'
implementation 'org.jsoup:jsoup:1.10.3'
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'org.jsoup:jsoup:1.11.3'
apt 'com.google.dagger:dagger-compiler:2.0.2'
......
briar-core/witness.gradle
View file @ b68dbd6a
......@@ -5,10 +5,10 @@ dependencyVerification {
'com.google.dagger:dagger-producers:2.0-beta:dagger-producers-2.0-beta.jar:99ec15e8a0507ba569e7655bc1165ee5e5ca5aa914b3c8f7e2c2458f724edd6b',
'com.google.dagger:dagger:2.0.2:dagger-2.0.2.jar:84c0282ed8be73a29e0475d639da030b55dee72369e58dd35ae7d4fe6243dcf9',
'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99',
'com.rometools:rome-utils:1.7.3:rome-utils-1.7.3.jar:f774a80e7e1bc9db5426b62333ab362537f901636cd0812dc84cb5ee2668acf9',
'com.rometools:rome:1.7.3:rome-1.7.3.jar:077367bf8fa01b211c9da712c2aa862724195773c5693fd4d97d61d6457e96c6',
'com.squareup.okhttp3:okhttp:3.8.0:okhttp-3.8.0.jar:19e1db51787716ff0046fa19e408fb34ed32a6274baa0c07475bf724b4eb6800',
'com.squareup.okio:okio:1.13.0:okio-1.13.0.jar:734269c3ebc5090e3b23566db558f421f0b4027277c79ad5d176b8ec168bb850',
'com.rometools:rome-utils:1.10.0:rome-utils-1.10.0.jar:5bcfe917fe90e89ae8e02fed543c3657a882565a6bc98197fc11905d88a2a501',
'com.rometools:rome:1.10.0:rome-1.10.0.jar:9ff5156d800f6c9ecbe7fca54daf756ac2720c41eb9240d2d66379700f1ecb8a',
'com.squareup.okhttp3:okhttp:3.10.0:okhttp-3.10.0.jar:4aca3e552afb1ceb47f8956685f6295a276e49fa03f9066f8b6be83bec56fb66',
'com.squareup.okio:okio:1.14.0:okio-1.14.0.jar:4633c331f50642ebe795dc089d6a5928aff43071c9d17e7840a009eea2fe95a3',
'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
'junit:junit:4.12:junit-4.12.jar:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
'net.jodah:concurrentunit:0.4.2:concurrentunit-0.4.2.jar:5583078e1acf91734939e985bc9e7ee947b0e93a8eef679da6bb07bbeb47ced3',
......@@ -25,7 +25,7 @@ dependencyVerification {
'org.jmock:jmock-legacy:2.8.2:jmock-legacy-2.8.2.jar:f2b985a5c08a9edb7f37612330c058809da3f6a6d63ce792426ebf8ff0d6d31b',
'org.jmock:jmock-testjar:2.8.2:jmock-testjar-2.8.2.jar:8900860f72c474e027cf97fe78dcbf154a1aa7fc62b6845c5fb4e4f3c7bc8760',
'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16',
'org.jsoup:jsoup:1.10.3:jsoup-1.10.3.jar:a0784e793d7f518eb1defb47b428da011cd483c5da32d49c569bf491e4f1579a',
'org.jsoup:jsoup:1.11.3:jsoup-1.11.3.jar:df2c71a4240ecbdae7cdcd1667bcf0d747e4e3dcefe8161e787adcff7e5f2fa0',
'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80',
'org.ow2.asm:asm-all:5.2:asm-all-5.2.jar:7fbffbc1db3422e2101689fd88df8384b15817b52b9b2b267b9f6d2511dc198d',
'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220',
......
build.gradle
View file @ b68dbd6a
......@@ -27,9 +27,9 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.9'
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.3'
classpath 'com.android.tools.build:gradle:3.2.0'
classpath 'net.ltgt.gradle:gradle-apt-plugin:0.18'
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.6'
classpath files('libs/gradle-witness.jar')
}
}
gradle.properties 0 → 100644
View file @ b68dbd6a
noWitness=androidApis
libs/gradle-witness.jar
View file @ b68dbd6a
No preview for this file type
update-dependency-pinning.sh
View file @ b68dbd6a
......@@ -22,5 +22,5 @@ done
for project in ${PROJECTS[@]}
do
echo "Calculating new checksums for ${project} ..."
./gradlew -q ${project}:calculateChecksums | grep -v '^Verifying' > ${project}/witness.gradle
./gradlew -q ${project}:calculateChecksums | grep -v '^\(Skipping\|Verifying\)' > ${project}/witness.gradle
done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment