From 6691d2164f255e3de9ff8fd5dd443d754f231c0c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:10:34 +0100 Subject: [PATCH 01/15] Upgrade Gradle Android plugin and build tools. --- .../All_tests_in_bramble_android.xml | 3 - .../All_tests_in_bramble_api.xml | 3 - .../All_tests_in_bramble_core.xml | 3 - .../All_tests_in_bramble_java.xml | 3 - .../All_tests_in_briar_android.xml | 3 - .../All_tests_in_briar_core.xml | 3 - .../runConfigurations/H2_Performance_Test.xml | 3 - .../HyperSQL_Performance_Test.xml | 3 - bramble-android/build.gradle | 2 +- bramble-android/witness.gradle | 79 ++++++++++--------- briar-android/witness.gradle | 79 ++++++++++--------- build.gradle | 2 +- 12 files changed, 84 insertions(+), 102 deletions(-) diff --git a/.idea/runConfigurations/All_tests_in_bramble_android.xml b/.idea/runConfigurations/All_tests_in_bramble_android.xml index 73901bd43..fa7e8e1f0 100644 --- a/.idea/runConfigurations/All_tests_in_bramble_android.xml +++ b/.idea/runConfigurations/All_tests_in_bramble_android.xml @@ -1,6 +1,5 @@ - - diff --git a/.idea/runConfigurations/All_tests_in_bramble_api.xml b/.idea/runConfigurations/All_tests_in_bramble_api.xml index bc8cd347d..530c012a7 100644 --- a/.idea/runConfigurations/All_tests_in_bramble_api.xml +++ b/.idea/runConfigurations/All_tests_in_bramble_api.xml @@ -1,6 +1,5 @@ - - diff --git a/.idea/runConfigurations/All_tests_in_bramble_core.xml b/.idea/runConfigurations/All_tests_in_bramble_core.xml index a39658d46..a6f120af2 100644 --- a/.idea/runConfigurations/All_tests_in_bramble_core.xml +++ b/.idea/runConfigurations/All_tests_in_bramble_core.xml @@ -1,6 +1,5 @@ - - diff --git a/.idea/runConfigurations/All_tests_in_bramble_java.xml b/.idea/runConfigurations/All_tests_in_bramble_java.xml index 1da1744cd..0eb5373bb 100644 --- a/.idea/runConfigurations/All_tests_in_bramble_java.xml +++ b/.idea/runConfigurations/All_tests_in_bramble_java.xml @@ -1,6 +1,5 @@ - - diff --git a/.idea/runConfigurations/All_tests_in_briar_android.xml b/.idea/runConfigurations/All_tests_in_briar_android.xml index bb5ca0630..3eadde01b 100644 --- a/.idea/runConfigurations/All_tests_in_briar_android.xml +++ b/.idea/runConfigurations/All_tests_in_briar_android.xml @@ -1,6 +1,5 @@ - - diff --git a/.idea/runConfigurations/All_tests_in_briar_core.xml b/.idea/runConfigurations/All_tests_in_briar_core.xml index 53cbd43b8..a1709faeb 100644 --- a/.idea/runConfigurations/All_tests_in_briar_core.xml +++ b/.idea/runConfigurations/All_tests_in_briar_core.xml @@ -1,6 +1,5 @@ - - diff --git a/.idea/runConfigurations/H2_Performance_Test.xml b/.idea/runConfigurations/H2_Performance_Test.xml index 74c628b75..21e2b632a 100644 --- a/.idea/runConfigurations/H2_Performance_Test.xml +++ b/.idea/runConfigurations/H2_Performance_Test.xml @@ -1,6 +1,5 @@ - - diff --git a/.idea/runConfigurations/HyperSQL_Performance_Test.xml b/.idea/runConfigurations/HyperSQL_Performance_Test.xml index 30e486f4c..ae8823b89 100644 --- a/.idea/runConfigurations/HyperSQL_Performance_Test.xml +++ b/.idea/runConfigurations/HyperSQL_Performance_Test.xml @@ -1,6 +1,5 @@ - - diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index dcc52bba2..95def91a2 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -4,7 +4,7 @@ apply from: 'witness.gradle' android { compileSdkVersion 27 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.2' defaultConfig { minSdkVersion 14 diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index 8a32cdc0a..0339ec782 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -1,40 +1,43 @@ dependencyVerification { verify = [ + 'Android:Sdk:platforms:android.jar:c94be7c1b823cd9672636f92d3c995e85cecb3674b2cbd4e8614db731367dc7f', 'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861', - 'com.android.tools.analytics-library:protos:26.1.3:protos-26.1.3.jar:818c9f256f141d9dafec03a1aa2b94d240b2c140acfd7ee31a8b3e6c2b9479e3', - 'com.android.tools.analytics-library:shared:26.1.3:shared-26.1.3.jar:7110706c7ada96c8b6f5ca80c478291bc7899d46277de2c48527e045442401a3', - 'com.android.tools.analytics-library:tracker:26.1.3:tracker-26.1.3.jar:4155424bf2ce4872da83332579a1707252bc66cbd77c5144fdc4483d0f2e1418', - 'com.android.tools.build:apksig:3.1.3:apksig-3.1.3.jar:7e1f8e675a6e768e5b56405e41d6c3cc05befe62e601b04177de1029902c9c89', - 'com.android.tools.build:builder-model:3.1.3:builder-model-3.1.3.jar:06ad1c422d679fc698451479cb40ba863849d67bfd1de23f6d2c16d78b024b0b', - 'com.android.tools.build:builder-test-api:3.1.3:builder-test-api-3.1.3.jar:4d989f780436794f0f8b2f50e9e079b786571eac90f26c208ab2ae6d4012f389', - 'com.android.tools.build:builder:3.1.3:builder-3.1.3.jar:8a1092012c89d0ec1ee2eff09c5708c71ef4482a6862df8d3a44a67fccace01c', - 'com.android.tools.build:gradle-api:3.1.3:gradle-api-3.1.3.jar:01e4df521456aef66514336f1d492346730dd1fb8f6433a89f62da834941ed72', - 'com.android.tools.build:manifest-merger:26.1.3:manifest-merger-26.1.3.jar:1e4fc7e932adb4607082409800e5e6fccb42e6c5360ae5990094bf522f3ada55', - 'com.android.tools.ddms:ddmlib:26.1.3:ddmlib-26.1.3.jar:c54931cd68df5d1ea2923b3b320eae47cd2307a5a916bb8674c0acf93cd1d3cd', - 'com.android.tools.external.com-intellij:intellij-core:26.1.3:intellij-core-26.1.3.jar:af67f5535fef2e1a28b1007a4acb8c5deb6a1e33b8afe7b11d012c9e778ebcec', - 'com.android.tools.external.com-intellij:kotlin-compiler:26.1.3:kotlin-compiler-26.1.3.jar:c746d2859dc11cc05c84b692b3498d3a621e0929511f8440ee009c6557838fd4', - 'com.android.tools.external.org-jetbrains:uast:26.1.3:uast-26.1.3.jar:3f3f6651d0c7685a77ecb22e9c82d6b49fdf24322c17360768dc530678f43265', - 'com.android.tools.layoutlib:layoutlib-api:26.1.3:layoutlib-api-26.1.3.jar:10bc73ce706c45629872d6a999dbe12116df64e24f47ff93b7b13121ff57b4b0', - 'com.android.tools.lint:lint-api:26.1.3:lint-api-26.1.3.jar:6f97323f9af8deda86278717885b5c927f3766757db89709f52d11d42b6fb751', - 'com.android.tools.lint:lint-checks:26.1.3:lint-checks-26.1.3.jar:73c3d53784c9ce3e6d5968506581918e0179645d20809927ca4a001dd766b001', - 'com.android.tools.lint:lint-gradle-api:26.1.3:lint-gradle-api-26.1.3.jar:7ca3c4866ec21dc21d53a9d86f752b77ace6f6c610a0c9dc877313856c733d9d', - 'com.android.tools.lint:lint-gradle:26.1.3:lint-gradle-26.1.3.jar:db0c354b8f4b6f6637e31f91c564785a59ff896325331fcbc3de7458e0b6c067', - 'com.android.tools.lint:lint-kotlin:26.1.3:lint-kotlin-26.1.3.jar:94e2b0f4565a241561cfb8fc1222bb3f132a3b98d2a90421dbb72ee8358e7d68', - 'com.android.tools.lint:lint:26.1.3:lint-26.1.3.jar:8d5f32c989c6d191d712e90ad3ca2d1c409313599551d04d834caa44d26c78df', - 'com.android.tools:annotations:26.1.3:annotations-26.1.3.jar:c950430b24ac5d58fc97e7283b8f0115f99587e76e08b4e1e2aaa780f2d77323', - 'com.android.tools:common:26.1.3:common-26.1.3.jar:7c31a90581a148ab219f615a59667f0dded7fa39b248529784474da3c2274ef2', - 'com.android.tools:dvlib:26.1.3:dvlib-26.1.3.jar:0cae87906f53d3f1088366a916ed180a7312b6d9919b90797f238875c8492855', - 'com.android.tools:repository:26.1.3:repository-26.1.3.jar:52d4539cc68db91b261e2a33b2c8206b26e05539078758dc28cfb3854adb4f59', - 'com.android.tools:sdk-common:26.1.3:sdk-common-26.1.3.jar:1948603ca9ff22c7ebb3178000bffa3a9dd2ca1cc5cb0c793cae08468b8fcfc1', - 'com.android.tools:sdklib:26.1.3:sdklib-26.1.3.jar:4adcfaad9514607098d2c51503c39811112d3050f4d1e744c01c7f08f591032b', + 'com.android.tools.analytics-library:protos:26.2.0:protos-26.2.0.jar:306784ac579be37f64f110204ea3fad8568e09e10817bb574bac0fc71b6402c5', + 'com.android.tools.analytics-library:shared:26.2.0:shared-26.2.0.jar:10782c593b7edcaf63cf79f7179c4652fee1c01298e0d81d888eea5ea1c320d4', + 'com.android.tools.analytics-library:tracker:26.2.0:tracker-26.2.0.jar:74e3cf587bcd6f5f14a6cddb8123c6940baf9947582f5356c25dd852c4726564', + 'com.android.tools.build:aapt2:3.2.0-4818971:aapt2-3.2.0-4818971-linux.jar:0d86e045e9eb009ab8add53cf0e5c0f48674e8c8a4edd3b19fc978ea38508bb1', + 'com.android.tools.build:apksig:3.2.0:apksig-3.2.0.jar:d393b14a2f85a4052645fa0b59e111b46dea0fd59a934bec6cf1e997a0640e30', + 'com.android.tools.build:apkzlib:3.2.0:apkzlib-3.2.0.jar:d8a3404d63a1037207bc2eb472209c606f8143d201f484da9dacd04ffa538c31', + 'com.android.tools.build:builder-model:3.2.0:builder-model-3.2.0.jar:7deb28465f2303fdc9df58ba83d080193edefe1624784d3ce9e0a0949ae05a49', + 'com.android.tools.build:builder-test-api:3.2.0:builder-test-api-3.2.0.jar:b7c6676da0793240f16874c4008f12ed3ed1bc56a4a73f5e760044024ac9a02a', + 'com.android.tools.build:builder:3.2.0:builder-3.2.0.jar:191df45703f615a02db16ce5ce78489f1ec91f9b83e677bec5de29de765e326d', + 'com.android.tools.build:gradle-api:3.2.0:gradle-api-3.2.0.jar:5645c5ee4138b1354b24bed43e005964296a5f1ef48b6772ed9800159dcc2830', + 'com.android.tools.build:manifest-merger:26.2.0:manifest-merger-26.2.0.jar:b821830bf067852688673cae01fb571c04da094985a3894878070b50f0587edf', + 'com.android.tools.ddms:ddmlib:26.2.0:ddmlib-26.2.0.jar:ff9b6951698a6ec005b25e5e3b5f7fe960f566131ba8fcdf713392e10cc2dd50', + 'com.android.tools.external.com-intellij:intellij-core:26.2.0:intellij-core-26.2.0.jar:03724f5aff30c8fff3d0b0c05e71f8dc21f246952fe1f3b5916bfb594e337bad', + 'com.android.tools.external.com-intellij:kotlin-compiler:26.2.0:kotlin-compiler-26.2.0.jar:2f82e0c2687afe7c4941bdf6702d9a16d71d030a7ddb384a04a0537a361f4bb1', + 'com.android.tools.external.org-jetbrains:uast:26.2.0:uast-26.2.0.jar:a439cafcddb2963620fd737005e3ce0560313362ede37e6c6eac5f10ff19eb94', + 'com.android.tools.layoutlib:layoutlib-api:26.2.0:layoutlib-api-26.2.0.jar:5987488847729bad6a1e72cd5dcc46b68b61d8f05ef60858b87ed1d3b9bacc58', + 'com.android.tools.lint:lint-api:26.2.0:lint-api-26.2.0.jar:aa4dc0399b6ae602286b9b106c661b50f6a8e1143c5949d3e7fd93c4a4d1513d', + 'com.android.tools.lint:lint-checks:26.2.0:lint-checks-26.2.0.jar:c8c8dfdbd5c97a371e239b6000f4c6929bce315c2b13e690aaf34e3fcb045520', + 'com.android.tools.lint:lint-gradle-api:26.2.0:lint-gradle-api-26.2.0.jar:befc1ad242e5e89e8977b2f799c465fee1b096ac645eba659acab832980599cd', + 'com.android.tools.lint:lint-gradle:26.2.0:lint-gradle-26.2.0.jar:332d257f20537020fd268468f678ccfbcc0be494fa50526b63c532836dc7c5dd', + 'com.android.tools.lint:lint-kotlin:26.2.0:lint-kotlin-26.2.0.jar:c149e09434aa24a6f7161dbd4b09f08c46f018cb0ee1ee2d1a32bf3b5015e081', + 'com.android.tools.lint:lint:26.2.0:lint-26.2.0.jar:4df411ea5ef106780073c6e953ab591a55d52e94c9b1cd2f99970a124eca405e', + 'com.android.tools:annotations:26.2.0:annotations-26.2.0.jar:af775f75168acbadb2ff61d6955e4fbeca9b1bd9f7a40b54ab7a489e30af45bb', + 'com.android.tools:common:26.2.0:common-26.2.0.jar:3e60e91bc7c7a634bbfae3522c5e0b49e8a268a2d69904bed4bd55833f8bb0c9', + 'com.android.tools:dvlib:26.2.0:dvlib-26.2.0.jar:c4d8fac5b8432e3676256ece4e25c3e55e8ef2da4298fb060cc6086d7e2235fc', + 'com.android.tools:repository:26.2.0:repository-26.2.0.jar:9c9e320195e7e6d9bbdf9b5b0ed1d7e4da3625ad344902cb47b32c9ef8306d82', + 'com.android.tools:sdk-common:26.2.0:sdk-common-26.2.0.jar:1e32745633177b28419041d9bd182bb99b51d1a7ad3f9b1c8b5292ed799656cd', + 'com.android.tools:sdklib:26.2.0:sdklib-26.2.0.jar:08e2715f9abd3870df8e311f77ff6f3dae61193c1f6a2de78bf2e49c6ba4725a', 'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed', - 'com.google.code.gson:gson:2.7:gson-2.7.jar:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32', + 'com.google.code.gson:gson:2.8.0:gson-2.8.0.jar:c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825', 'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3', '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.errorprone:error_prone_annotations:2.0.18:error_prone_annotations-2.0.18.jar:cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b', 'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99', - 'com.google.guava:guava:22.0:guava-22.0.jar:1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e', + 'com.google.guava:guava:23.0:guava-23.0.jar:7baa80df284117e5b945b19b98d367a85ea7b7801bd358ff657946c3bd1b6596', 'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f', 'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd', 'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4', @@ -43,8 +46,8 @@ dependencyVerification { 'com.sun.activation:javax.activation:1.2.0:javax.activation-1.2.0.jar:993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce', 'com.sun.istack:istack-commons-runtime:2.21:istack-commons-runtime-2.21.jar:c33e67a0807095f02a0e2da139412dd7c4f9cc1a4c054b3e434f96831ba950f4', 'com.sun.xml.fastinfoset:FastInfoset:1.2.13:FastInfoset-1.2.13.jar:27a77db909f3c2833c0b1a37c55af1db06045118ad2eed96ce567b6632bce038', - 'commons-codec:commons-codec:1.6:commons-codec-1.6.jar:54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86', - 'commons-logging:commons-logging:1.1.1:commons-logging-1.1.1.jar:ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f', + 'commons-codec:commons-codec:1.9:commons-codec-1.9.jar:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce', + 'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636', 'it.unimi.dsi:fastutil:7.2.0:fastutil-7.2.0.jar:74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c', 'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f', 'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', @@ -55,9 +58,9 @@ dependencyVerification { '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.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6', - 'org.apache.httpcomponents:httpclient:4.2.6:httpclient-4.2.6.jar:362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550', - 'org.apache.httpcomponents:httpcore:4.2.5:httpcore-4.2.5.jar:e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9', - 'org.apache.httpcomponents:httpmime:4.1:httpmime-4.1.jar:31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa', + 'org.apache.httpcomponents:httpclient:4.5.2:httpclient-4.5.2.jar:0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057', + 'org.apache.httpcomponents:httpcore:4.4.5:httpcore-4.4.5.jar:64d5453874cab7e40a7065cb01a9a9ca1053845a9786b478878b679e0580cec3', + 'org.apache.httpcomponents:httpmime:4.5.2:httpmime-4.5.2.jar:231a3f7e4962053db2be8461d5422e68fc458a3a7dd7d8ada803a348e21f8f07', 'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8', 'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca', 'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349', @@ -81,11 +84,11 @@ dependencyVerification { 'org.jmock:jmock:2.8.2:jmock-2.8.2.jar:6c73cb4a2e6dbfb61fd99c9a768539c170ab6568e57846bd60dbf19596b65b16', 'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4', 'org.objenesis:objenesis:2.1:objenesis-2.1.jar:c74330cc6b806c804fd37e74487b4fe5d7c2750c5e15fbc6efa13bdee1bdef80', - 'org.ow2.asm:asm-analysis:5.1:asm-analysis-5.1.jar:a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9', - 'org.ow2.asm:asm-commons:5.1:asm-commons-5.1.jar:97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be', - 'org.ow2.asm:asm-tree:5.1:asm-tree-5.1.jar:c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10', - 'org.ow2.asm:asm-util:5.1:asm-util-5.1.jar:ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040', + 'org.ow2.asm:asm-analysis:6.0:asm-analysis-6.0.jar:2f1a6387219c3a6cc4856481f221b03bd9f2408a326d416af09af5d6f608c1f4', + 'org.ow2.asm:asm-commons:6.0:asm-commons-6.0.jar:f1bce5c648a96a017bdcd01fe5d59af9845297fd7b79b81c015a6fbbd9719abf', + 'org.ow2.asm:asm-tree:6.0:asm-tree-6.0.jar:887998fb69727c8759e4d253f856822801e33f9fd4caa566b3ac58ee92106215', + 'org.ow2.asm:asm-util:6.0:asm-util-6.0.jar:356afebdb0f870175262e5188f8709a3b17aa2a5a6a4b0340b04d4b449bca5f6', 'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220', - 'org.ow2.asm:asm:5.1:asm-5.1.jar:d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54', + 'org.ow2.asm:asm:6.0:asm-6.0.jar:dd8971c74a4e697899a8e95caae4ea8760ea6c486dc6b97b1795e75760420461', ] } diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle index 0fa29a1f9..b7e5c980d 100644 --- a/briar-android/witness.gradle +++ b/briar-android/witness.gradle @@ -1,5 +1,6 @@ dependencyVerification { verify = [ + 'Android:Sdk:platforms:android.jar:d20853d289a5161d9cf1c1268d7923076487d4fa68c970b0733e2d5a0ccfc3c5', 'android.arch.core:common:1.1.0:common-1.1.0.jar:d34824b794bc92ff8f647a9bb13a7c73de920de5b47075b5d2c4f0770e9b8bfd', 'android.arch.core:runtime:1.1.0:runtime-1.1.0.aar:83400f7575bcfb8a2eeec64e05590f037bfaed1e56aa3a4214d20e55878445e3', 'android.arch.lifecycle:common:1.1.0:common-1.1.0.jar:614e31cfd33255dc4d5f5d8e62cfa6be2fbbc2a35643a79dc3ed008004c30807', @@ -37,44 +38,46 @@ dependencyVerification { 'com.android.support:support-v4:27.1.1:support-v4-27.1.1.aar:4f41dfc3e89f2738e45c86264a85c0934d055ee8ebe2020e23c97f303b80a48b', 'com.android.support:support-vector-drawable:27.1.1:support-vector-drawable-27.1.1.aar:1c0f421114cf4627cf208776d6eb4f76340c78b7e96fe6e12b3e6eb950caf1b9', 'com.android.support:transition:27.1.1:transition-27.1.1.aar:c0765b2f3c78696567ec5b3f519d22da1e3df11ac994625adf4bb4dc571caacc', - 'com.android.tools.analytics-library:protos:26.1.3:protos-26.1.3.jar:818c9f256f141d9dafec03a1aa2b94d240b2c140acfd7ee31a8b3e6c2b9479e3', - 'com.android.tools.analytics-library:shared:26.1.3:shared-26.1.3.jar:7110706c7ada96c8b6f5ca80c478291bc7899d46277de2c48527e045442401a3', - 'com.android.tools.analytics-library:tracker:26.1.3:tracker-26.1.3.jar:4155424bf2ce4872da83332579a1707252bc66cbd77c5144fdc4483d0f2e1418', - 'com.android.tools.build:apksig:3.1.3:apksig-3.1.3.jar:7e1f8e675a6e768e5b56405e41d6c3cc05befe62e601b04177de1029902c9c89', - 'com.android.tools.build:builder-model:3.1.3:builder-model-3.1.3.jar:06ad1c422d679fc698451479cb40ba863849d67bfd1de23f6d2c16d78b024b0b', - 'com.android.tools.build:builder-test-api:3.1.3:builder-test-api-3.1.3.jar:4d989f780436794f0f8b2f50e9e079b786571eac90f26c208ab2ae6d4012f389', - 'com.android.tools.build:builder:3.1.3:builder-3.1.3.jar:8a1092012c89d0ec1ee2eff09c5708c71ef4482a6862df8d3a44a67fccace01c', - 'com.android.tools.build:gradle-api:3.1.3:gradle-api-3.1.3.jar:01e4df521456aef66514336f1d492346730dd1fb8f6433a89f62da834941ed72', - 'com.android.tools.build:manifest-merger:26.1.3:manifest-merger-26.1.3.jar:1e4fc7e932adb4607082409800e5e6fccb42e6c5360ae5990094bf522f3ada55', - 'com.android.tools.ddms:ddmlib:26.1.3:ddmlib-26.1.3.jar:c54931cd68df5d1ea2923b3b320eae47cd2307a5a916bb8674c0acf93cd1d3cd', - 'com.android.tools.external.com-intellij:intellij-core:26.1.3:intellij-core-26.1.3.jar:af67f5535fef2e1a28b1007a4acb8c5deb6a1e33b8afe7b11d012c9e778ebcec', - 'com.android.tools.external.com-intellij:kotlin-compiler:26.1.3:kotlin-compiler-26.1.3.jar:c746d2859dc11cc05c84b692b3498d3a621e0929511f8440ee009c6557838fd4', - 'com.android.tools.external.org-jetbrains:uast:26.1.3:uast-26.1.3.jar:3f3f6651d0c7685a77ecb22e9c82d6b49fdf24322c17360768dc530678f43265', - 'com.android.tools.layoutlib:layoutlib-api:26.1.3:layoutlib-api-26.1.3.jar:10bc73ce706c45629872d6a999dbe12116df64e24f47ff93b7b13121ff57b4b0', - 'com.android.tools.lint:lint-api:26.1.3:lint-api-26.1.3.jar:6f97323f9af8deda86278717885b5c927f3766757db89709f52d11d42b6fb751', - 'com.android.tools.lint:lint-checks:26.1.3:lint-checks-26.1.3.jar:73c3d53784c9ce3e6d5968506581918e0179645d20809927ca4a001dd766b001', - 'com.android.tools.lint:lint-gradle-api:26.1.3:lint-gradle-api-26.1.3.jar:7ca3c4866ec21dc21d53a9d86f752b77ace6f6c610a0c9dc877313856c733d9d', - 'com.android.tools.lint:lint-gradle:26.1.3:lint-gradle-26.1.3.jar:db0c354b8f4b6f6637e31f91c564785a59ff896325331fcbc3de7458e0b6c067', - 'com.android.tools.lint:lint-kotlin:26.1.3:lint-kotlin-26.1.3.jar:94e2b0f4565a241561cfb8fc1222bb3f132a3b98d2a90421dbb72ee8358e7d68', - 'com.android.tools.lint:lint:26.1.3:lint-26.1.3.jar:8d5f32c989c6d191d712e90ad3ca2d1c409313599551d04d834caa44d26c78df', - 'com.android.tools:annotations:26.1.3:annotations-26.1.3.jar:c950430b24ac5d58fc97e7283b8f0115f99587e76e08b4e1e2aaa780f2d77323', - 'com.android.tools:common:26.1.3:common-26.1.3.jar:7c31a90581a148ab219f615a59667f0dded7fa39b248529784474da3c2274ef2', - 'com.android.tools:dvlib:26.1.3:dvlib-26.1.3.jar:0cae87906f53d3f1088366a916ed180a7312b6d9919b90797f238875c8492855', - 'com.android.tools:repository:26.1.3:repository-26.1.3.jar:52d4539cc68db91b261e2a33b2c8206b26e05539078758dc28cfb3854adb4f59', - 'com.android.tools:sdk-common:26.1.3:sdk-common-26.1.3.jar:1948603ca9ff22c7ebb3178000bffa3a9dd2ca1cc5cb0c793cae08468b8fcfc1', - 'com.android.tools:sdklib:26.1.3:sdklib-26.1.3.jar:4adcfaad9514607098d2c51503c39811112d3050f4d1e744c01c7f08f591032b', + 'com.android.tools.analytics-library:protos:26.2.0:protos-26.2.0.jar:306784ac579be37f64f110204ea3fad8568e09e10817bb574bac0fc71b6402c5', + 'com.android.tools.analytics-library:shared:26.2.0:shared-26.2.0.jar:10782c593b7edcaf63cf79f7179c4652fee1c01298e0d81d888eea5ea1c320d4', + 'com.android.tools.analytics-library:tracker:26.2.0:tracker-26.2.0.jar:74e3cf587bcd6f5f14a6cddb8123c6940baf9947582f5356c25dd852c4726564', + 'com.android.tools.build:aapt2:3.2.0-4818971:aapt2-3.2.0-4818971-linux.jar:0d86e045e9eb009ab8add53cf0e5c0f48674e8c8a4edd3b19fc978ea38508bb1', + 'com.android.tools.build:apksig:3.2.0:apksig-3.2.0.jar:d393b14a2f85a4052645fa0b59e111b46dea0fd59a934bec6cf1e997a0640e30', + 'com.android.tools.build:apkzlib:3.2.0:apkzlib-3.2.0.jar:d8a3404d63a1037207bc2eb472209c606f8143d201f484da9dacd04ffa538c31', + 'com.android.tools.build:builder-model:3.2.0:builder-model-3.2.0.jar:7deb28465f2303fdc9df58ba83d080193edefe1624784d3ce9e0a0949ae05a49', + 'com.android.tools.build:builder-test-api:3.2.0:builder-test-api-3.2.0.jar:b7c6676da0793240f16874c4008f12ed3ed1bc56a4a73f5e760044024ac9a02a', + 'com.android.tools.build:builder:3.2.0:builder-3.2.0.jar:191df45703f615a02db16ce5ce78489f1ec91f9b83e677bec5de29de765e326d', + 'com.android.tools.build:gradle-api:3.2.0:gradle-api-3.2.0.jar:5645c5ee4138b1354b24bed43e005964296a5f1ef48b6772ed9800159dcc2830', + 'com.android.tools.build:manifest-merger:26.2.0:manifest-merger-26.2.0.jar:b821830bf067852688673cae01fb571c04da094985a3894878070b50f0587edf', + 'com.android.tools.ddms:ddmlib:26.2.0:ddmlib-26.2.0.jar:ff9b6951698a6ec005b25e5e3b5f7fe960f566131ba8fcdf713392e10cc2dd50', + 'com.android.tools.external.com-intellij:intellij-core:26.2.0:intellij-core-26.2.0.jar:03724f5aff30c8fff3d0b0c05e71f8dc21f246952fe1f3b5916bfb594e337bad', + 'com.android.tools.external.com-intellij:kotlin-compiler:26.2.0:kotlin-compiler-26.2.0.jar:2f82e0c2687afe7c4941bdf6702d9a16d71d030a7ddb384a04a0537a361f4bb1', + 'com.android.tools.external.org-jetbrains:uast:26.2.0:uast-26.2.0.jar:a439cafcddb2963620fd737005e3ce0560313362ede37e6c6eac5f10ff19eb94', + 'com.android.tools.layoutlib:layoutlib-api:26.2.0:layoutlib-api-26.2.0.jar:5987488847729bad6a1e72cd5dcc46b68b61d8f05ef60858b87ed1d3b9bacc58', + 'com.android.tools.lint:lint-api:26.2.0:lint-api-26.2.0.jar:aa4dc0399b6ae602286b9b106c661b50f6a8e1143c5949d3e7fd93c4a4d1513d', + 'com.android.tools.lint:lint-checks:26.2.0:lint-checks-26.2.0.jar:c8c8dfdbd5c97a371e239b6000f4c6929bce315c2b13e690aaf34e3fcb045520', + 'com.android.tools.lint:lint-gradle-api:26.2.0:lint-gradle-api-26.2.0.jar:befc1ad242e5e89e8977b2f799c465fee1b096ac645eba659acab832980599cd', + 'com.android.tools.lint:lint-gradle:26.2.0:lint-gradle-26.2.0.jar:332d257f20537020fd268468f678ccfbcc0be494fa50526b63c532836dc7c5dd', + 'com.android.tools.lint:lint-kotlin:26.2.0:lint-kotlin-26.2.0.jar:c149e09434aa24a6f7161dbd4b09f08c46f018cb0ee1ee2d1a32bf3b5015e081', + 'com.android.tools.lint:lint:26.2.0:lint-26.2.0.jar:4df411ea5ef106780073c6e953ab591a55d52e94c9b1cd2f99970a124eca405e', + 'com.android.tools:annotations:26.2.0:annotations-26.2.0.jar:af775f75168acbadb2ff61d6955e4fbeca9b1bd9f7a40b54ab7a489e30af45bb', + 'com.android.tools:common:26.2.0:common-26.2.0.jar:3e60e91bc7c7a634bbfae3522c5e0b49e8a268a2d69904bed4bd55833f8bb0c9', + 'com.android.tools:dvlib:26.2.0:dvlib-26.2.0.jar:c4d8fac5b8432e3676256ece4e25c3e55e8ef2da4298fb060cc6086d7e2235fc', + 'com.android.tools:repository:26.2.0:repository-26.2.0.jar:9c9e320195e7e6d9bbdf9b5b0ed1d7e4da3625ad344902cb47b32c9ef8306d82', + 'com.android.tools:sdk-common:26.2.0:sdk-common-26.2.0.jar:1e32745633177b28419041d9bd182bb99b51d1a7ad3f9b1c8b5292ed799656cd', + 'com.android.tools:sdklib:26.2.0:sdklib-26.2.0.jar:08e2715f9abd3870df8e311f77ff6f3dae61193c1f6a2de78bf2e49c6ba4725a', 'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f', 'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1:accessibility-test-framework-2.1.jar:7b0aa6ed7553597ce0610684a9f7eca8021eee218f2e2f427c04a7fbf5f920bd', 'com.google.code.findbugs:jsr305:1.3.9:jsr305-1.3.9.jar:905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed', 'com.google.code.findbugs:jsr305:3.0.2:jsr305-3.0.2.jar:766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7', - 'com.google.code.gson:gson:2.7:gson-2.7.jar:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32', + 'com.google.code.gson:gson:2.8.0:gson-2.8.0.jar:c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825', 'com.google.dagger:dagger-compiler:2.0.2:dagger-compiler-2.0.2.jar:b74bc9de063dd4c6400b232231f2ef5056145b8fbecbf5382012007dd1c071b3', '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.errorprone:error_prone_annotations:2.0.18:error_prone_annotations-2.0.18.jar:cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b', 'com.google.guava:guava:18.0:guava-18.0.jar:d664fbfc03d2e5ce9cab2a44fb01f1d0bf9dfebeccc1a473b1f9ea31f79f6f99', 'com.google.guava:guava:20.0:guava-20.0.jar:36a666e3b71ae7f0f0dca23654b67e086e6c93d192f60ba5dfd5519db6c288c8', - 'com.google.guava:guava:22.0:guava-22.0.jar:1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e', + 'com.google.guava:guava:23.0:guava-23.0.jar:7baa80df284117e5b945b19b98d367a85ea7b7801bd358ff657946c3bd1b6596', 'com.google.j2objc:j2objc-annotations:1.1:j2objc-annotations-1.1.jar:40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f', 'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd', 'com.google.protobuf:protobuf-java:2.6.1:protobuf-java-2.6.1.jar:55aa554843983f431df5616112cf688d38aa17c132357afd1c109435bfdac4e6', @@ -91,8 +94,8 @@ dependencyVerification { 'com.thoughtworks.xstream:xstream:1.4.8:xstream-1.4.8.jar:a219a1abf948400b669d08be73a6f9209fb720d237e5ff74c223bffe5f9df93d', 'com.vanniktech:emoji-google:0.5.1:emoji-google-0.5.1.aar:5f4a88e1a3bb5f694ddccf2e49dc9ccc44431f1d4f980bc453c178f57869dea0', 'com.vanniktech:emoji:0.5.1:emoji-0.5.1.aar:d55f44e04e31895647d62c33c34a8d501995e9e1b5c5f5cee6cbb8630eeb37f7', - 'commons-codec:commons-codec:1.6:commons-codec-1.6.jar:54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86', - 'commons-logging:commons-logging:1.1.1:commons-logging-1.1.1.jar:ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f', + 'commons-codec:commons-codec:1.9:commons-codec-1.9.jar:ad19d2601c3abf0b946b5c3a4113e226a8c1e3305e395b90013b78dd94a723ce', + 'commons-logging:commons-logging:1.2:commons-logging-1.2.jar:daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636', 'de.hdodenhof:circleimageview:2.2.0:circleimageview-2.2.0.aar:bc34761dcd5036229ac1ffed6b5b1bef722ad5b097a2c8bba1c5ed2cd4b5c82b', 'info.guardianproject.panic:panic:0.5:panic-0.5.jar:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2', 'info.guardianproject.trustedintents:trustedintents:0.2:trustedintents-0.2.jar:6221456d8821a8d974c2acf86306900237cf6afaaa94a4c9c44e161350f80f3e', @@ -110,9 +113,9 @@ dependencyVerification { '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.apache.commons:commons-compress:1.12:commons-compress-1.12.jar:2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6', - 'org.apache.httpcomponents:httpclient:4.2.6:httpclient-4.2.6.jar:362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550', - 'org.apache.httpcomponents:httpcore:4.2.5:httpcore-4.2.5.jar:e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9', - 'org.apache.httpcomponents:httpmime:4.1:httpmime-4.1.jar:31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa', + 'org.apache.httpcomponents:httpclient:4.5.2:httpclient-4.5.2.jar:0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057', + 'org.apache.httpcomponents:httpcore:4.4.5:httpcore-4.4.5.jar:64d5453874cab7e40a7065cb01a9a9ca1053845a9786b478878b679e0580cec3', + 'org.apache.httpcomponents:httpmime:4.5.2:httpmime-4.5.2.jar:231a3f7e4962053db2be8461d5422e68fc458a3a7dd7d8ada803a348e21f8f07', 'org.apache.maven.wagon:wagon-file:1.0-beta-6:wagon-file-1.0-beta-6.jar:7298feeb36ff14dd933c38e62585fb9973fea32fb3c4bc5379428cb1aac5dd3c', 'org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6:wagon-http-lightweight-1.0-beta-6.jar:be214032de23c6b520b79c1ccdb160948e0c67ed7c11984b7ec4ca5537867b4e', 'org.apache.maven.wagon:wagon-http-shared:1.0-beta-6:wagon-http-shared-1.0-beta-6.jar:f095c882716d49269a806685dcb256fa6a36389b2713ac56bb758bf8693565a2', @@ -155,14 +158,14 @@ dependencyVerification { 'org.jvnet.staxex:stax-ex:1.7.7:stax-ex-1.7.7.jar:a31ff7d77163c0deb09e7fee59ad35ae44c2cee2cc8552a116ccd1583d813fb4', 'org.mockito:mockito-core:2.13.0:mockito-core-2.13.0.jar:92a746b37cf8c5730a5e7b35fd7d8cd72700089435ff92ee03ed8384d4eb3377', 'org.objenesis:objenesis:2.6:objenesis-2.6.jar:5e168368fbc250af3c79aa5fef0c3467a2d64e5a7bd74005f25d8399aeb0708d', - 'org.ow2.asm:asm-analysis:5.1:asm-analysis-5.1.jar:a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9', + 'org.ow2.asm:asm-analysis:6.0:asm-analysis-6.0.jar:2f1a6387219c3a6cc4856481f221b03bd9f2408a326d416af09af5d6f608c1f4', 'org.ow2.asm:asm-commons:5.0.1:asm-commons-5.0.1.jar:fb1cb7fa27d892712ced8fbf8d027eb5052ecd3999dba1ba47824357accb40e7', - 'org.ow2.asm:asm-commons:5.1:asm-commons-5.1.jar:97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be', + 'org.ow2.asm:asm-commons:6.0:asm-commons-6.0.jar:f1bce5c648a96a017bdcd01fe5d59af9845297fd7b79b81c015a6fbbd9719abf', 'org.ow2.asm:asm-tree:5.0.1:asm-tree-5.0.1.jar:ff2aceed10da9930a44f6c8f81c6372d5e55eb59c4e0ea9d37f77dfd765fa9fa', - 'org.ow2.asm:asm-tree:5.1:asm-tree-5.1.jar:c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10', - 'org.ow2.asm:asm-util:5.1:asm-util-5.1.jar:ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040', + 'org.ow2.asm:asm-tree:6.0:asm-tree-6.0.jar:887998fb69727c8759e4d253f856822801e33f9fd4caa566b3ac58ee92106215', + 'org.ow2.asm:asm-util:6.0:asm-util-6.0.jar:356afebdb0f870175262e5188f8709a3b17aa2a5a6a4b0340b04d4b449bca5f6', 'org.ow2.asm:asm:5.0.4:asm-5.0.4.jar:896618ed8ae62702521a78bc7be42b7c491a08e6920a15f89a3ecdec31e9a220', - 'org.ow2.asm:asm:5.1:asm-5.1.jar:d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54', + 'org.ow2.asm:asm:6.0:asm-6.0.jar:dd8971c74a4e697899a8e95caae4ea8760ea6c486dc6b97b1795e75760420461', 'org.robolectric:annotations:3.8:annotations-3.8.jar:8eab08facfe2a8cd22f6a09f4378f012a5985c0d4f4ad4e203e00f75b5568458', 'org.robolectric:junit:3.8:junit-3.8.jar:042575dbc95dc82ec046d13438ccda578917ce786d2f464cba0eb18da1f412cb', 'org.robolectric:resources:3.8:resources-3.8.jar:6d11e6d39df8eda837c52319cf8d6bef424df45be6f29b3a731707832eb6ffc1', diff --git a/build.gradle b/build.gradle index b3a53aa51..abe263bd9 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.2.0' classpath 'net.ltgt.gradle:gradle-apt-plugin:0.9' classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.3' classpath files('libs/gradle-witness.jar') From e795efc7fc52591494a4cc4077993e53397d5f40 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:11:32 +0100 Subject: [PATCH 02/15] Bump compileSdkVersion for bramble-android. --- bramble-android/build.gradle | 2 +- bramble-android/witness.gradle | 1 - briar-android/witness.gradle | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index 95def91a2..90962c8df 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'witness' apply from: 'witness.gradle' android { - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion '28.0.2' defaultConfig { diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index 0339ec782..25cf176fa 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -1,6 +1,5 @@ dependencyVerification { verify = [ - 'Android:Sdk:platforms:android.jar:c94be7c1b823cd9672636f92d3c995e85cecb3674b2cbd4e8614db731367dc7f', 'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861', 'com.android.tools.analytics-library:protos:26.2.0:protos-26.2.0.jar:306784ac579be37f64f110204ea3fad8568e09e10817bb574bac0fc71b6402c5', 'com.android.tools.analytics-library:shared:26.2.0:shared-26.2.0.jar:10782c593b7edcaf63cf79f7179c4652fee1c01298e0d81d888eea5ea1c320d4', diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle index b7e5c980d..3cc6b4063 100644 --- a/briar-android/witness.gradle +++ b/briar-android/witness.gradle @@ -1,6 +1,5 @@ dependencyVerification { verify = [ - 'Android:Sdk:platforms:android.jar:d20853d289a5161d9cf1c1268d7923076487d4fa68c970b0733e2d5a0ccfc3c5', 'android.arch.core:common:1.1.0:common-1.1.0.jar:d34824b794bc92ff8f647a9bb13a7c73de920de5b47075b5d2c4f0770e9b8bfd', 'android.arch.core:runtime:1.1.0:runtime-1.1.0.aar:83400f7575bcfb8a2eeec64e05590f037bfaed1e56aa3a4214d20e55878445e3', 'android.arch.lifecycle:common:1.1.0:common-1.1.0.jar:614e31cfd33255dc4d5f5d8e62cfa6be2fbbc2a35643a79dc3ed008004c30807', From bd2514a2992a629d589702100cbee11aab2356f6 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:16:53 +0100 Subject: [PATCH 03/15] Upgrade support library to 28.0.0. --- bramble-android/witness.gradle | 1 + briar-android/build.gradle | 2 +- briar-android/witness.gradle | 61 ++++++++++++++++++++++------------ 3 files changed, 41 insertions(+), 23 deletions(-) diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index 25cf176fa..abb73e398 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -1,5 +1,6 @@ dependencyVerification { verify = [ + 'Android:Sdk:platforms:android.jar:d20853d289a5161d9cf1c1268d7923076487d4fa68c970b0733e2d5a0ccfc3c5', 'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861', 'com.android.tools.analytics-library:protos:26.2.0:protos-26.2.0.jar:306784ac579be37f64f110204ea3fad8568e09e10817bb574bac0fc71b6402c5', 'com.android.tools.analytics-library:shared:26.2.0:shared-26.2.0.jar:10782c593b7edcaf63cf79f7179c4652fee1c01298e0d81d888eea5ea1c320d4', diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 60d4c42a3..403807f33 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -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' diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle index 3cc6b4063..76767686b 100644 --- a/briar-android/witness.gradle +++ b/briar-android/witness.gradle @@ -1,11 +1,13 @@ dependencyVerification { verify = [ - 'android.arch.core:common:1.1.0:common-1.1.0.jar:d34824b794bc92ff8f647a9bb13a7c73de920de5b47075b5d2c4f0770e9b8bfd', - 'android.arch.core:runtime:1.1.0:runtime-1.1.0.aar:83400f7575bcfb8a2eeec64e05590f037bfaed1e56aa3a4214d20e55878445e3', - 'android.arch.lifecycle:common:1.1.0:common-1.1.0.jar:614e31cfd33255dc4d5f5d8e62cfa6be2fbbc2a35643a79dc3ed008004c30807', - 'android.arch.lifecycle:livedata-core:1.1.0:livedata-core-1.1.0.aar:14e57ff8ffb65a80c7e72d91f2076acccdaf2970f234c6261e03a6127eb5206b', - 'android.arch.lifecycle:runtime:1.1.0:runtime-1.1.0.aar:094fd793924dd6a5136753e599ac8174a8147f4a401386b694ba7d818c223e2e', - 'android.arch.lifecycle:viewmodel:1.1.0:viewmodel-1.1.0.aar:6407c93a5ea9850661dca42a0068d6f3deccefd7228ee69bae1c35d70cbc2557', + 'Android:Sdk:platforms:android.jar:d20853d289a5161d9cf1c1268d7923076487d4fa68c970b0733e2d5a0ccfc3c5', + 'android.arch.core:common:1.1.1:common-1.1.1.jar:3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a', + 'android.arch.core:runtime:1.1.1:runtime-1.1.1.aar:c3215aa5873311b3f88a6f4e4a3c25ad89971bc127de8c3e1291c57f93a05c39', + 'android.arch.lifecycle:common:1.1.1:common-1.1.1.jar:8d378e88ebd5189e09eef623414812c868fd90aa519d6160e2311fb8b81cff56', + 'android.arch.lifecycle:livedata-core:1.1.1:livedata-core-1.1.1.aar:d6fdd8b985d6178d7ea2f16986a24e83f1bee936b74d43167c69e08d3cc12c50', + 'android.arch.lifecycle:livedata:1.1.1:livedata-1.1.1.aar:50ab0490c1ff1a7cfb4e554032998b080888946d0dd424f39900efc4a1bcd750', + 'android.arch.lifecycle:runtime:1.1.1:runtime-1.1.1.aar:c4e4be66c1b2f0abec593571454e1de14013f7e0f96bf2a9f212931a48cae550', + 'android.arch.lifecycle:viewmodel:1.1.1:viewmodel-1.1.1.aar:7de29cfaba77d6b5d5be234c57f6812d0150d087e63941af22ba1d1f8e2bc96a', 'backport-util-concurrent:backport-util-concurrent:3.1:backport-util-concurrent-3.1.jar:f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902', 'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861', 'ch.acra:acra:4.9.1:acra-4.9.1.aar:d2762968c448757a7d6acc9f141881d9632f664988e9723ece33b5f7c79f3bc9', @@ -21,22 +23,37 @@ dependencyVerification { 'com.android.support.test:monitor:1.0.2:monitor-1.0.2.aar:38ef4fa98a32dc55550ff49bb36a583e178b3a9b830fcb8dcc27bfc4254bc2bc', 'com.android.support.test:rules:1.0.2:rules-1.0.2.aar:7ddad387d1a16d4dbdbefacee070d34574e565b008117c1a163edac8ae02a6aa', 'com.android.support.test:runner:1.0.2:runner-1.0.2.aar:f04b9ae342975ba1cb3e4a06e13426e3e6b8a73faa45acba604493d83c9a4f00', - 'com.android.support:animated-vector-drawable:27.1.1:animated-vector-drawable-27.1.1.aar:59670473f6e98fda792f7bef25dd7292b0a3106031c7a5e30eb020bf26f077bd', - 'com.android.support:appcompat-v7:27.1.1:appcompat-v7-27.1.1.aar:0c7808fbbc5838d831e32e3c0a6f84e1f2c981deb8f11e010650f2b57923a335', - 'com.android.support:cardview-v7:27.1.1:cardview-v7-27.1.1.aar:8ed955dd037d82a7b4bbcaedb4f896523c3e4c1bf3ca698ce807c350767a2886', - 'com.android.support:design:27.1.1:design-27.1.1.aar:7225973f7ee03765008a9c2f17a40b154c6885169fef022276e811c926a2202c', - 'com.android.support:preference-v14:27.1.1:preference-v14-27.1.1.aar:dc058932e6fd93bf57d23fcc2f22351c21e5125e513721e4b0b03374341ad400', - 'com.android.support:preference-v7:27.1.1:preference-v7-27.1.1.aar:a1798a826b4097d00e49280f412b21af08f9bf1179c2e3838dc339d9f843416d', - 'com.android.support:recyclerview-v7:27.1.1:recyclerview-v7-27.1.1.aar:d735e4727878e99ef3980c10d15dc3468462fd509d4fb60cb8bd20b0f735085c', - 'com.android.support:support-annotations:27.1.1:support-annotations-27.1.1.jar:3365960206c3d2b09e845f555e7f88f8effc8d2f00b369e66c4be384029299cf', - 'com.android.support:support-compat:27.1.1:support-compat-27.1.1.aar:880ce01ff5be42b233ff8ec0c61cefb7dc3dc9500fea9e24423214813ac27ea2', - 'com.android.support:support-core-ui:27.1.1:support-core-ui-27.1.1.aar:a3ae20e6d5dffba69ac97b99846d2738003af8563843d5f3c9dc4c35b4804241', - 'com.android.support:support-core-utils:27.1.1:support-core-utils-27.1.1.aar:61036832c54e8701aae954fc3bf96d1d80bf8d9dd531bff77d72def456ba087a', - 'com.android.support:support-fragment:27.1.1:support-fragment-27.1.1.aar:ec72d6ac36a1a0e6523bbddba33d73ffad070b9b3dd246cc44d8727a41ddb5e6', - 'com.android.support:support-media-compat:27.1.1:support-media-compat-27.1.1.aar:55e9837dda88b74a8c812c63a78c63fd83c6c039a8c22d318492663a493585eb', - 'com.android.support:support-v4:27.1.1:support-v4-27.1.1.aar:4f41dfc3e89f2738e45c86264a85c0934d055ee8ebe2020e23c97f303b80a48b', - 'com.android.support:support-vector-drawable:27.1.1:support-vector-drawable-27.1.1.aar:1c0f421114cf4627cf208776d6eb4f76340c78b7e96fe6e12b3e6eb950caf1b9', - 'com.android.support:transition:27.1.1:transition-27.1.1.aar:c0765b2f3c78696567ec5b3f519d22da1e3df11ac994625adf4bb4dc571caacc', + 'com.android.support:animated-vector-drawable:28.0.0:animated-vector-drawable-28.0.0.aar:271ecbc906cda8dcd9e655ba0473129c3408a4189c806f616c378e6fd18fb3b7', + 'com.android.support:appcompat-v7:28.0.0:appcompat-v7-28.0.0.aar:a3a8e5230359746ed91801579b5fbe4668e3b1c4e6a14c7d67c8f58cb0311752', + 'com.android.support:asynclayoutinflater:28.0.0:asynclayoutinflater-28.0.0.aar:115bde87721f7334579b0c735f60dd7c98af1bb7f34010c5b0553b95dc351aa2', + 'com.android.support:cardview-v7:28.0.0:cardview-v7-28.0.0.aar:bc9e6b0e06ce1205f1db34f0e6193019613d19cfeb54cdccea722340d1c60f26', + 'com.android.support:collections:28.0.0:collections-28.0.0.jar:93c258c8a09f531a267653829742c0f8f6da0e348b11cb8655b0855628f2d4f0', + 'com.android.support:coordinatorlayout:28.0.0:coordinatorlayout-28.0.0.aar:9dfacd80423dc979048fbaed83c0ee543c46259feb2417377e79a656888d3892', + 'com.android.support:cursoradapter:28.0.0:cursoradapter-28.0.0.aar:87feffe742b8d62ca8a9833abe564838bf6a672e31c7ad1306ec4006adf90d21', + 'com.android.support:customview:28.0.0:customview-28.0.0.aar:98db03845f994e08248bf701c1ff0ccaa12e70f94251ec9272900f0f694e072b', + 'com.android.support:design:28.0.0:design-28.0.0.aar:7874ad1904eedc74aa41cffffb7f759d8990056f3bbbc9264911651c67c42f5f', + 'com.android.support:documentfile:28.0.0:documentfile-28.0.0.aar:47cdcd3e9302b7b064923f05487a5c03babbd9bbda4726b71e97791fab5d4779', + 'com.android.support:drawerlayout:28.0.0:drawerlayout-28.0.0.aar:8f6809afae4793550c37461c9810e954ae6a23dbb4d23e5333bf18148df1150a', + 'com.android.support:interpolator:28.0.0:interpolator-28.0.0.aar:7bc7ee86a0db39a4b51956f3e89842d2bd962118d57d779eb6ed6b34ba0677ea', + 'com.android.support:loader:28.0.0:loader-28.0.0.aar:920b85efd72dc33e915b0f88a883fe73b88483c6df8751a741e17611f2460341', + 'com.android.support:localbroadcastmanager:28.0.0:localbroadcastmanager-28.0.0.aar:d287c823af5fdde72c099fcfc5f630efe9687af7a914343ae6fd92de32c8a806', + 'com.android.support:preference-v14:28.0.0:preference-v14-28.0.0.aar:8133c6e19233fa51e036a341e6d3f4adeead3375cebf777efced0fe154c3267e', + 'com.android.support:preference-v7:28.0.0:preference-v7-28.0.0.aar:75eabe936d1fc3b178450a554c4d433466036f2be6d6dccdf971eac9590fdbf5', + 'com.android.support:print:28.0.0:print-28.0.0.aar:4be8a812d73e4a80e35b91ceae127def3f0bb9726bf3bc439aa0cc81503f5728', + 'com.android.support:recyclerview-v7:28.0.0:recyclerview-v7-28.0.0.aar:eb296414c1f6d4c7b522f69fe50588ea85297855db0e7806c24eb4f75409587d', + 'com.android.support:slidingpanelayout:28.0.0:slidingpanelayout-28.0.0.aar:d1d234f66a1b36a9aee9b94fa6c66f97128c0828078c8e889e9037ec898cd600', + 'com.android.support:support-annotations:28.0.0:support-annotations-28.0.0.jar:5d5b9414f02d3fa0ee7526b8d5ddae0da67c8ecc8c4d63ffa6cf91488a93b927', + 'com.android.support:support-compat:28.0.0:support-compat-28.0.0.aar:e17e3b01dbea3f9ea1c86943292f903ca93d2231c6242e456e0b6a9c5817118a', + 'com.android.support:support-core-ui:28.0.0:support-core-ui-28.0.0.aar:bbc7f65fc95649464733af373361532ab5f9f3b749c3badaa2bbf27e574b6c6f', + 'com.android.support:support-core-utils:28.0.0:support-core-utils-28.0.0.aar:c81e1e98ca3cb2edae002c69cf35b22aec364b8cb2f1042c97e206eb5790ac41', + 'com.android.support:support-fragment:28.0.0:support-fragment-28.0.0.aar:3772fc738ada86824ba1a4b3f197c3dbd67b7ddcfe2c9db1de95ef2e3487a915', + 'com.android.support:support-media-compat:28.0.0:support-media-compat-28.0.0.aar:266eff9605f515013eee1ebdbd8818a9270696dc807f34bbcc5fc11fb61a22c7', + 'com.android.support:support-v4:28.0.0:support-v4-28.0.0.aar:8b9031381c678d628c9e47b566ae1d161e1c9710f7855c759beeac7596cecf30', + 'com.android.support:support-vector-drawable:28.0.0:support-vector-drawable-28.0.0.aar:f658986d968172bccfed28578471c96050780fe5e133861e4d331069cc373f4d', + 'com.android.support:swiperefreshlayout:28.0.0:swiperefreshlayout-28.0.0.aar:a3b41f7f6730866b49865e86e49f988d4858699765f534300fb2ff5f9325e712', + 'com.android.support:transition:28.0.0:transition-28.0.0.aar:45d09fc51284c17bbab300f5122512ac7d7348a6d23bda2051648bbe76cc9aa5', + 'com.android.support:versionedparcelable:28.0.0:versionedparcelable-28.0.0.aar:60eb1cb08f71b65c3f6123135e03ebeb5930b5e126e1e5b2ac91b386908c9d02', + 'com.android.support:viewpager:28.0.0:viewpager-28.0.0.aar:013c4c53058758ec104dbae970be58159f75dfe342ba8b937d15ff5282e35ffc', 'com.android.tools.analytics-library:protos:26.2.0:protos-26.2.0.jar:306784ac579be37f64f110204ea3fad8568e09e10817bb574bac0fc71b6402c5', 'com.android.tools.analytics-library:shared:26.2.0:shared-26.2.0.jar:10782c593b7edcaf63cf79f7179c4652fee1c01298e0d81d888eea5ea1c320d4', 'com.android.tools.analytics-library:tracker:26.2.0:tracker-26.2.0.jar:74e3cf587bcd6f5f14a6cddb8123c6940baf9947582f5356c25dd852c4726564', From 4d9fab85cb2406890b24fc520e581cf5476fd889 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:34:52 +0100 Subject: [PATCH 04/15] Upgrade zxing, material tap target libraries. --- briar-android/build.gradle | 4 ++-- briar-android/witness.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 403807f33..9f2799294 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -113,8 +113,8 @@ dependencies { 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' diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle index 76767686b..bd5edca9b 100644 --- a/briar-android/witness.gradle +++ b/briar-android/witness.gradle @@ -98,7 +98,7 @@ dependencyVerification { 'com.google.jimfs:jimfs:1.1:jimfs-1.1.jar:c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd', 'com.google.protobuf:protobuf-java:2.6.1:protobuf-java-2.6.1.jar:55aa554843983f431df5616112cf688d38aa17c132357afd1c109435bfdac4e6', 'com.google.protobuf:protobuf-java:3.4.0:protobuf-java-3.4.0.jar:dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4', - 'com.google.zxing:core:3.3.0:core-3.3.0.jar:bba7724e02a997cec38213af77133ee8e24b0d5cf5fa7ecbc16a4fa93f11ee0d', + 'com.google.zxing:core:3.3.3:core-3.3.3.jar:5820f81e943e4bce0329306621e2d6255d2930b0a6ce934c5c23c0d6d3f20599', 'com.googlecode.json-simple:json-simple:1.1:json-simple-1.1.jar:2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439', 'com.ibm.icu:icu4j:53.1:icu4j-53.1.jar:e37a4467bac5cdeb02c5c4b8e5063d2f4e67b69e3c7df6d6b610f13185572bab', 'com.jraska:falcon:1.0.4:falcon-1.0.4.aar:6114a48d8b3814f75fc69b5e84dc087c1254883874eae8a36bd778979800630a', @@ -192,7 +192,7 @@ dependencyVerification { 'org.robolectric:shadows-support-v4:3.3.2:shadows-support-v4-3.3.2.jar:6f689264738266e70fe08db7c04b7b5a75155994f4e3f7f311960d90486bf005', 'org.robolectric:utils:3.8:utils-3.8.jar:e945d04d40e37554e02d4be1bc3abf9bede45375c843aa36d10ccb6b63edbf34', 'tools.fastlane:screengrab:1.2.0:screengrab-1.2.0.aar:af4ee23bb06f94404d3ab18e2ea69db8265539fc8da29f9ee45b7e472684ba83', - 'uk.co.samuelwall:material-tap-target-prompt:2.8.0:material-tap-target-prompt-2.8.0.aar:ac70770c05bbc4675a1d5712c0e53d46ee4fa961b74947589fce50d8003065ec', + 'uk.co.samuelwall:material-tap-target-prompt:2.12.4:material-tap-target-prompt-2.12.4.aar:6c0990ab3aa22de9f7d09dcb0a944e671128c31634ac8429012faa5c508202fb', 'xmlpull:xmlpull:1.1.3.1:xmlpull-1.1.3.1.jar:34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63', 'xpp3:xpp3_min:1.1.4c:xpp3_min-1.1.4c.jar:bfc90e9e32d0eab1f397fb974b5f150a815188382ac41f372a7149d5bc178008', ] From 00b9c76bb8f78cabbab945a0275fea28d6dfc50f Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:38:45 +0100 Subject: [PATCH 05/15] Upgrade ACRA. --- briar-android/build.gradle | 2 +- briar-android/witness.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 9f2799294..7ad5205a8 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -106,7 +106,7 @@ 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' } diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle index bd5edca9b..d738271be 100644 --- a/briar-android/witness.gradle +++ b/briar-android/witness.gradle @@ -10,7 +10,7 @@ dependencyVerification { 'android.arch.lifecycle:viewmodel:1.1.1:viewmodel-1.1.1.aar:7de29cfaba77d6b5d5be234c57f6812d0150d087e63941af22ba1d1f8e2bc96a', 'backport-util-concurrent:backport-util-concurrent:3.1:backport-util-concurrent-3.1.jar:f5759b7fcdfc83a525a036deedcbd32e5b536b625ebc282426f16ca137eb5902', 'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861', - 'ch.acra:acra:4.9.1:acra-4.9.1.aar:d2762968c448757a7d6acc9f141881d9632f664988e9723ece33b5f7c79f3bc9', + 'ch.acra:acra:4.11:acra-4.11.aar:21ca06be074749c9aaf3f7df67fcbe3695e633b92e691f025af55cabde22e551', 'classworlds:classworlds:1.1-alpha-2:classworlds-1.1-alpha-2.jar:2bf4e59f3acd106fea6145a9a88fe8956509f8b9c0fdd11eb96fee757269e3f3', 'com.almworks.sqlite4java:sqlite4java:0.282:sqlite4java-0.282.jar:9e1d8dd83ca6003f841e3af878ce2dc7c22497493a7bb6d1b62ec1b0d0a83c05', 'com.android.support.constraint:constraint-layout-solver:1.1.3:constraint-layout-solver-1.1.3.jar:2cafbe356f71c208013d021f32943904798cd6459e5107f9fe27000eb5bc2aef', From 7d2f1abb94932254da4faf89ed4fd8e991922a34 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:42:11 +0100 Subject: [PATCH 06/15] Upgrade Gradle APT and Animal Sniffer plugins. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index abe263bd9..07f540a3a 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.2.0' - classpath 'net.ltgt.gradle:gradle-apt-plugin:0.9' - classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.3' + classpath 'net.ltgt.gradle:gradle-apt-plugin:0.18' + classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.4.6' classpath files('libs/gradle-witness.jar') } } From 031516ccce9ed174ccd650e90c58ae333bff36b2 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:45:38 +0100 Subject: [PATCH 07/15] Upgrade curve25519-java library. --- bramble-core/build.gradle | 2 +- bramble-core/witness.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bramble-core/build.gradle b/bramble-core/build.gradle index 56ddcde1c..58aa1da2e 100644 --- a/bramble-core/build.gradle +++ b/bramble-core/build.gradle @@ -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' diff --git a/bramble-core/witness.gradle b/bramble-core/witness.gradle index c35bb6c83..1c5c9819a 100644 --- a/bramble-core/witness.gradle +++ b/bramble-core/witness.gradle @@ -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', ] } From 074b10e177e4ee41ccf7334051e52af0688406c4 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:47:49 +0100 Subject: [PATCH 08/15] Upgrade JNA library. --- bramble-java/build.gradle | 4 ++-- bramble-java/witness.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bramble-java/build.gradle b/bramble-java/build.gradle index 9d54698f5..b40598d00 100644 --- a/bramble-java/build.gradle +++ b/bramble-java/build.gradle @@ -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' diff --git a/bramble-java/witness.gradle b/bramble-java/witness.gradle index 945bdc09e..bbe2b4e90 100644 --- a/bramble-java/witness.gradle +++ b/bramble-java/witness.gradle @@ -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', From ccbeee60a7fecb603d307457fcede83ae5baa83c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:51:46 +0100 Subject: [PATCH 09/15] Upgrade Rome, OkHttp and jsoup libraries. --- briar-core/build.gradle | 6 +++--- briar-core/witness.gradle | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/briar-core/build.gradle b/briar-core/build.gradle index f3fad0cba..28c69375a 100644 --- a/briar-core/build.gradle +++ b/briar-core/build.gradle @@ -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' diff --git a/briar-core/witness.gradle b/briar-core/witness.gradle index 6b809f405..d1dc95909 100644 --- a/briar-core/witness.gradle +++ b/briar-core/witness.gradle @@ -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', From b972d1fc13570fa6258048d5e8a429f9882b8ef6 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 16:53:52 +0100 Subject: [PATCH 10/15] Update ACRA usage for new version. --- .../android/reporting/BriarReportSender.java | 8 +------- .../android/reporting/DevReportActivity.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java index e5d62cdd8..f4d9b5aef 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/BriarReportSender.java @@ -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); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java index 2b29c79d5..d20ef8573 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java @@ -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 e : crashData.entrySet()) { + for (Entry 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> iter = + Iterator> iter = data.entrySet().iterator(); while (iter.hasNext()) { - Entry e = iter.next(); + Entry 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; } From 3b871f59321ef687c0af935cd49c0196922d50aa Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 17:05:24 +0100 Subject: [PATCH 11/15] Update ProGuard rules for new OkHttp version. --- briar-android/proguard-rules.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/briar-android/proguard-rules.txt b/briar-android/proguard-rules.txt index f673f857a..feb5984a4 100644 --- a/briar-android/proguard-rules.txt +++ b/briar-android/proguard-rules.txt @@ -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 From 929102ed60f32f2e64fb37e776b40c4c0682cdc7 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 26 Sep 2018 17:39:49 +0100 Subject: [PATCH 12/15] Upgrade build tools to 28.0.3. --- bramble-android/build.gradle | 2 +- briar-android/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index 90962c8df..dd303d110 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -4,7 +4,7 @@ apply from: 'witness.gradle' android { compileSdkVersion 28 - buildToolsVersion '28.0.2' + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 14 diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 7ad5205a8..87b8da8bb 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -17,7 +17,7 @@ def getStdout = { command, defaultValue -> android { compileSdkVersion 28 - buildToolsVersion '28.0.2' + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 15 From e8566906ef54216935dfb8acaf36f1753724807a Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 1 Oct 2018 17:12:41 +0100 Subject: [PATCH 13/15] Update gradle-witness to exclude android.jar from dependencies. --- bramble-android/witness.gradle | 1 - briar-android/witness.gradle | 1 - gradle.properties | 1 + libs/gradle-witness.jar | Bin 23641 -> 24487 bytes update-dependency-pinning.sh | 2 +- 5 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 gradle.properties diff --git a/bramble-android/witness.gradle b/bramble-android/witness.gradle index abb73e398..25cf176fa 100644 --- a/bramble-android/witness.gradle +++ b/bramble-android/witness.gradle @@ -1,6 +1,5 @@ dependencyVerification { verify = [ - 'Android:Sdk:platforms:android.jar:d20853d289a5161d9cf1c1268d7923076487d4fa68c970b0733e2d5a0ccfc3c5', 'cglib:cglib:3.2.0:cglib-3.2.0.jar:adb13bab79712ad6bdf1bd59f2a3918018a8016e722e8a357065afb9e6690861', 'com.android.tools.analytics-library:protos:26.2.0:protos-26.2.0.jar:306784ac579be37f64f110204ea3fad8568e09e10817bb574bac0fc71b6402c5', 'com.android.tools.analytics-library:shared:26.2.0:shared-26.2.0.jar:10782c593b7edcaf63cf79f7179c4652fee1c01298e0d81d888eea5ea1c320d4', diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle index d738271be..2f4db82c1 100644 --- a/briar-android/witness.gradle +++ b/briar-android/witness.gradle @@ -1,6 +1,5 @@ dependencyVerification { verify = [ - 'Android:Sdk:platforms:android.jar:d20853d289a5161d9cf1c1268d7923076487d4fa68c970b0733e2d5a0ccfc3c5', 'android.arch.core:common:1.1.1:common-1.1.1.jar:3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a', 'android.arch.core:runtime:1.1.1:runtime-1.1.1.aar:c3215aa5873311b3f88a6f4e4a3c25ad89971bc127de8c3e1291c57f93a05c39', 'android.arch.lifecycle:common:1.1.1:common-1.1.1.jar:8d378e88ebd5189e09eef623414812c868fd90aa519d6160e2311fb8b81cff56', diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..31d5ed8ac --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +noWitness=androidApis diff --git a/libs/gradle-witness.jar b/libs/gradle-witness.jar index 20020926332a3c01506b35eeaa9dbe0f238e9a09..eeb8b228693a102aa5b331d5f04121e8f295f805 100644 GIT binary patch delta 18308 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 ${project}/witness.gradle + ./gradlew -q ${project}:calculateChecksums | grep -v '^\(Skipping\|Verifying\)' > ${project}/witness.gradle done From a6cd8937f748d69c4ece7f21065f32b7c69fc702 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 1 Oct 2018 20:27:49 -0300 Subject: [PATCH 14/15] Remove space reserved for icons from preferences Works around https://issuetracker.google.com/issues/111907042 Might be replacable with a solution from https://issuetracker.google.com/issues/111907042 in the future. --- .../src/main/res/xml/panic_preferences.xml | 9 ++- briar-android/src/main/res/xml/settings.xml | 70 ++++++++++++------- 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/briar-android/src/main/res/xml/panic_preferences.xml b/briar-android/src/main/res/xml/panic_preferences.xml index b19d36545..67887eb26 100644 --- a/briar-android/src/main/res/xml/panic_preferences.xml +++ b/briar-android/src/main/res/xml/panic_preferences.xml @@ -1,12 +1,14 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:title="@string/panic_setting_signout_title" + app:iconSpaceReserved="false"/> + android:title="@string/purge_setting_title" + app:iconSpaceReserved="false"/> diff --git a/briar-android/src/main/res/xml/settings.xml b/briar-android/src/main/res/xml/settings.xml index 2865760de..1ed3c3630 100644 --- a/briar-android/src/main/res/xml/settings.xml +++ b/briar-android/src/main/res/xml/settings.xml @@ -1,6 +1,7 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -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"/> - + android:title="@string/pref_theme_title" + app:iconSpaceReserved="false"/> + + android:title="@string/bluetooth_setting" + app:iconSpaceReserved="false"/> + android:title="@string/tor_network_setting" + app:iconSpaceReserved="false"/> + android:widgetLayout="@layout/preference_switch_compat" + app:iconSpaceReserved="false"/> @@ -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"/> + android:title="@string/pref_lock_timeout_title" + app:iconSpaceReserved="false"/> + android:title="@string/change_password" + app:iconSpaceReserved="false"> + android:title="@string/panic_setting" + app:iconSpaceReserved="false"> + android:widgetLayout="@layout/preference_switch_compat" + app:iconSpaceReserved="false"/> + android:widgetLayout="@layout/preference_switch_compat" + app:iconSpaceReserved="false"/> + android:widgetLayout="@layout/preference_switch_compat" + app:iconSpaceReserved="false"/> + android:widgetLayout="@layout/preference_switch_compat" + app:iconSpaceReserved="false"/> + android:widgetLayout="@layout/preference_switch_compat" + app:iconSpaceReserved="false"/> + android:widgetLayout="@layout/preference_switch_compat" + app:iconSpaceReserved="false"/> + android:title="@string/notify_sound_setting" + app:iconSpaceReserved="false"/> + android:title="@string/feedback_settings_title"> - + + + + android:title="Create Test Data" + app:iconSpaceReserved="false"> + android:title="Crash" + app:iconSpaceReserved="false"/> From 4d08c6977943fd1f3b8b0905d0486783d43d9959 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 3 Oct 2018 13:08:00 +0100 Subject: [PATCH 15/15] Revert spurious changes to run configurations. --- .idea/runConfigurations/All_tests_in_bramble_android.xml | 3 +++ .idea/runConfigurations/All_tests_in_bramble_api.xml | 3 +++ .idea/runConfigurations/All_tests_in_bramble_core.xml | 3 +++ .idea/runConfigurations/All_tests_in_bramble_java.xml | 3 +++ .idea/runConfigurations/All_tests_in_briar_android.xml | 3 +++ .idea/runConfigurations/All_tests_in_briar_core.xml | 3 +++ .idea/runConfigurations/H2_Performance_Test.xml | 3 +++ .idea/runConfigurations/HyperSQL_Performance_Test.xml | 3 +++ 8 files changed, 24 insertions(+) diff --git a/.idea/runConfigurations/All_tests_in_bramble_android.xml b/.idea/runConfigurations/All_tests_in_bramble_android.xml index fa7e8e1f0..73901bd43 100644 --- a/.idea/runConfigurations/All_tests_in_bramble_android.xml +++ b/.idea/runConfigurations/All_tests_in_bramble_android.xml @@ -1,5 +1,6 @@ + + diff --git a/.idea/runConfigurations/All_tests_in_bramble_api.xml b/.idea/runConfigurations/All_tests_in_bramble_api.xml index 530c012a7..bc8cd347d 100644 --- a/.idea/runConfigurations/All_tests_in_bramble_api.xml +++ b/.idea/runConfigurations/All_tests_in_bramble_api.xml @@ -1,5 +1,6 @@ + + diff --git a/.idea/runConfigurations/All_tests_in_bramble_core.xml b/.idea/runConfigurations/All_tests_in_bramble_core.xml index a6f120af2..a39658d46 100644 --- a/.idea/runConfigurations/All_tests_in_bramble_core.xml +++ b/.idea/runConfigurations/All_tests_in_bramble_core.xml @@ -1,5 +1,6 @@ + + diff --git a/.idea/runConfigurations/All_tests_in_bramble_java.xml b/.idea/runConfigurations/All_tests_in_bramble_java.xml index 0eb5373bb..1da1744cd 100644 --- a/.idea/runConfigurations/All_tests_in_bramble_java.xml +++ b/.idea/runConfigurations/All_tests_in_bramble_java.xml @@ -1,5 +1,6 @@ + + diff --git a/.idea/runConfigurations/All_tests_in_briar_android.xml b/.idea/runConfigurations/All_tests_in_briar_android.xml index 3eadde01b..bb5ca0630 100644 --- a/.idea/runConfigurations/All_tests_in_briar_android.xml +++ b/.idea/runConfigurations/All_tests_in_briar_android.xml @@ -1,5 +1,6 @@ + + diff --git a/.idea/runConfigurations/All_tests_in_briar_core.xml b/.idea/runConfigurations/All_tests_in_briar_core.xml index a1709faeb..53cbd43b8 100644 --- a/.idea/runConfigurations/All_tests_in_briar_core.xml +++ b/.idea/runConfigurations/All_tests_in_briar_core.xml @@ -1,5 +1,6 @@ + + diff --git a/.idea/runConfigurations/H2_Performance_Test.xml b/.idea/runConfigurations/H2_Performance_Test.xml index 21e2b632a..74c628b75 100644 --- a/.idea/runConfigurations/H2_Performance_Test.xml +++ b/.idea/runConfigurations/H2_Performance_Test.xml @@ -1,5 +1,6 @@ + + diff --git a/.idea/runConfigurations/HyperSQL_Performance_Test.xml b/.idea/runConfigurations/HyperSQL_Performance_Test.xml index ae8823b89..30e486f4c 100644 --- a/.idea/runConfigurations/HyperSQL_Performance_Test.xml +++ b/.idea/runConfigurations/HyperSQL_Performance_Test.xml @@ -1,5 +1,6 @@ + +