Bump dependency major versions

.gitignore

@@ -1,9 +1,70 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
-/build
-/captures
+
+# From https://github.com/github/gitignore/blob/master/Android.gitignore
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md

.travis.yml

@@ -5,7 +5,7 @@ android:
    - tools #Running this twice get's the latest build tools (https://github.com/codepath/android_guides/wiki/Setting-up-Travis-CI)
    - platform-tools
    - android-25
-   - build-tools-26.0.2
+   - build-tools-28.0.3
    - extra
 
 jdk: oraclejdk8

app/build.gradle

@@ -5,7 +5,7 @@ def dbflow_version = "4.2.4"
 android {
     compileSdkVersion 25
     // Make sure to also update build-tools-* in .travis.yml
-    buildToolsVersion "26.0.2"
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.alternativeinfrastructures.noise"
         minSdkVersion 21
@@ -18,7 +18,7 @@ android {
 
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -41,28 +41,27 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.4.0'
-    compile 'com.android.support:design:25.4.0'
-    testCompile 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:3.8'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:25.4.0'
+    implementation 'com.android.support:design:25.4.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:4.0.1'
+    testImplementation "androidx.test:runner:1.1.0"
+    testImplementation "androidx.test:rules:1.1.0"
 
-    compile group: 'net.vidageek', name: 'mirror', version: '1.6.1'
+    implementation group: 'net.vidageek', name: 'mirror', version: '1.6.1'
 
-    compile 'com.squareup.okio:okio:1.14.1'
+    implementation 'com.squareup.okio:okio:1.16.0'
 
-    compile "io.reactivex.rxjava2:rxandroid:2.0.2"
-    compile "io.reactivex.rxjava2:rxjava:2.1.14"
+    implementation "io.reactivex.rxjava2:rxandroid:2.1.0"
+    implementation "io.reactivex.rxjava2:rxjava:2.2.3"
 
     annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}"
-    compile "com.github.Raizlabs.DBFlow:dbflow-core:${dbflow_version}"
-    compile "com.github.Raizlabs.DBFlow:dbflow:${dbflow_version}"
-    compile "com.github.Raizlabs.DBFlow:dbflow-rx2:${dbflow_version}"
+    implementation "com.github.Raizlabs.DBFlow:dbflow-core:${dbflow_version}"
+    implementation "com.github.Raizlabs.DBFlow:dbflow:${dbflow_version}"
+    implementation "com.github.Raizlabs.DBFlow:dbflow-rx2:${dbflow_version}"
 
-    compile 'org.whispersystems:signal-protocol-android:2.3.0'
-    compile 'com.github.stfalcon:chatkit:0.2.2'
+    implementation 'org.whispersystems:signal-protocol-android:2.3.0'
+    implementation 'com.github.stfalcon:chatkit:0.2.2'
 }

app/src/androidTest/java/com/alternativeinfrastructures/noise/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.alternativeinfrastructures.noise;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/java/com/alternativeinfrastructures/noise/storage/BloomFilter.java

@@ -61,7 +61,7 @@ static List<Integer> hashMessage(UnknownMessage message) {
     }
 
     static void addMessage(UnknownMessage message, DatabaseWrapper databaseWrapper) {
-        if (Looper.getMainLooper().getThread() == Thread.currentThread())
+        if (Looper.getMainLooper() == Looper.myLooper())
             Log.e(TAG, "Attempting to save on the UI thread");
 
         for (int hash : hashMessage(message)) {

app/src/main/java/com/alternativeinfrastructures/noise/storage/IdentityAnnouncementMessage.java

@@ -4,7 +4,6 @@
 import com.alternativeinfrastructures.noise.models.RemoteIdentity;
 
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyAction;
 import com.raizlabs.android.dbflow.annotation.Index;
 import com.raizlabs.android.dbflow.annotation.Table;
 

app/src/main/java/com/alternativeinfrastructures/noise/storage/UnknownMessage.java

@@ -14,7 +14,6 @@
 import com.raizlabs.android.dbflow.rx2.structure.BaseRXModel;
 import com.raizlabs.android.dbflow.sql.language.SQLite;
 import com.raizlabs.android.dbflow.structure.database.DatabaseWrapper;
-import com.raizlabs.android.dbflow.structure.database.transaction.Transaction;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -290,7 +289,7 @@ private UnknownMessage sign() {
         // TODO: Sign on multiple threads
         // TODO: Use a memory-intensive proof-of-work function to minimize the impact of bogus messages signed by ASICs (like Ethereum)
         // http://www.ethdocs.org/en/latest/introduction/what-is-ethereum.html#how-does-ethereum-work
-        if (Looper.getMainLooper().getThread() == Thread.currentThread())
+        if (Looper.getMainLooper() == Looper.myLooper())
             Log.e(TAG, "Attempting to sign on the UI thread");
 
         Log.d(TAG, "Signing started");

app/src/test/java/com/alternativeinfrastructures/noise/storage/BloomFilterTest.java

@@ -1,23 +1,16 @@
 package com.alternativeinfrastructures.noise.storage;
 
-import com.alternativeinfrastructures.noise.BuildConfig;
 import com.alternativeinfrastructures.noise.TestBase;
-import com.raizlabs.android.dbflow.config.FlowManager;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowLog;
 
 import java.util.BitSet;
 
 import static org.junit.Assert.*;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
 public class BloomFilterTest extends TestBase {
     @Test
     public void newMessageMembership() throws Exception {

app/src/test/java/com/alternativeinfrastructures/noise/storage/IdentityAnnouncementMessageTest.java

@@ -23,7 +23,7 @@
 import static org.junit.Assert.*;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
+// @Config(constants = BuildConfig.class)
 public class IdentityAnnouncementMessageTest extends TestBase {
     @Test
     public void castThroughUnknownMessage() throws Exception {

app/src/test/java/com/alternativeinfrastructures/noise/storage/MessageTypesTest.java

@@ -18,7 +18,7 @@
 import static org.junit.Assert.*;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
+// @Config(constants = BuildConfig.class)
 public class MessageTypesTest extends TestBase {
     @Test
     public void downcastUnknownType() throws Exception {

app/src/test/java/com/alternativeinfrastructures/noise/storage/UnknownMessageTest.java

@@ -1,17 +1,11 @@
 package com.alternativeinfrastructures.noise.storage;
 
-import com.alternativeinfrastructures.noise.BuildConfig;
 import com.alternativeinfrastructures.noise.TestBase;
-import com.raizlabs.android.dbflow.config.FlowManager;
 import com.raizlabs.android.dbflow.sql.language.SQLite;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowLog;
 
 import java.io.ByteArrayInputStream;
 import java.util.UUID;
@@ -21,7 +15,6 @@
 import static org.junit.Assert.*;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
 public class UnknownMessageTest extends TestBase {
     public static UnknownMessage createTestMessage(byte[] payload) throws Exception {
         final byte zeroBits = 10;

app/src/test/java/com/alternativeinfrastructures/noise/sync/StreamSyncTest.java

@@ -31,7 +31,7 @@
 import static org.junit.Assert.*;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class)
+// @Config(constants = BuildConfig.class)
 public class StreamSyncTest extends TestBase {
     static final long PIPE_SIZE = 16384;
     static final int TIMEOUT_VALUE = 10;