androidx migration

app/src/main/java/com/samourai/sentinel/codescanner/BarcodeUtils.java

@@ -25,9 +25,9 @@ package com.samourai.sentinel.codescanner;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;

app/src/main/java/com/samourai/sentinel/codescanner/CameraFragmentBottomSheet.java

 package com.samourai.sentinel.codescanner;
 
 import android.os.Bundle;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialogFragment;
-import android.support.design.widget.CoordinatorLayout;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
 import com.samourai.sentinel.R;
 
 

app/src/main/java/com/samourai/sentinel/codescanner/CodeScanner.java

@@ -10,9 +10,9 @@ import android.hardware.Camera.CameraInfo;
 import android.hardware.Camera.Parameters;
 import android.os.Handler;
 import android.os.Process;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.SurfaceHolder;
 
 import com.google.zxing.BarcodeFormat;

app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerException.java

@@ -24,8 +24,8 @@
 package com.samourai.sentinel.codescanner;
 
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 /**
  * Common class for code scanner runtime exceptions

app/src/main/java/com/samourai/sentinel/codescanner/CodeScannerView.java

@@ -28,13 +28,13 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
-import android.support.annotation.Nullable;
-import android.support.annotation.Px;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StyleRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StyleRes;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.SurfaceView;

app/src/main/java/com/samourai/sentinel/codescanner/DecodeCallback.java

@@ -26,8 +26,8 @@ package com.samourai.sentinel.codescanner;
 import android.app.Activity;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import com.google.zxing.Result;
 

app/src/main/java/com/samourai/sentinel/codescanner/DecodeTask.java

@@ -23,8 +23,8 @@
  */
 package com.samourai.sentinel.codescanner;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.zxing.MultiFormatReader;
 import com.google.zxing.PlanarYUVLuminanceSource;

app/src/main/java/com/samourai/sentinel/codescanner/Decoder.java

@@ -24,8 +24,8 @@
 package com.samourai.sentinel.codescanner;
 
 import android.os.Process;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;

app/src/main/java/com/samourai/sentinel/codescanner/DecoderWrapper.java

@@ -24,7 +24,7 @@
 package com.samourai.sentinel.codescanner;
 
 import android.hardware.Camera;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 final class DecoderWrapper {

app/src/main/java/com/samourai/sentinel/codescanner/ErrorCallback.java

@@ -26,8 +26,8 @@ package com.samourai.sentinel.codescanner;
 import android.app.Activity;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 
 /**

app/src/main/java/com/samourai/sentinel/codescanner/Rect.java

@@ -24,7 +24,7 @@
 package com.samourai.sentinel.codescanner;
 
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 
 final class Rect {

app/src/main/java/com/samourai/sentinel/codescanner/Utils.java

@@ -28,8 +28,8 @@ import android.hardware.Camera.Area;
 import android.hardware.Camera.CameraInfo;
 import android.hardware.Camera.Parameters;
 import android.hardware.Camera.Size;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.Surface;
 import android.view.WindowManager;
 

app/src/main/java/com/samourai/sentinel/codescanner/ViewFinderView.java

@@ -27,11 +27,11 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.support.annotation.ColorInt;
-import android.support.annotation.FloatRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Px;
+import androidx.annotation.ColorInt;
+import androidx.annotation.FloatRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import android.view.View;
 
 final class ViewFinderView extends View {

build.gradle

 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.4.0'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,5 +19,8 @@ allprojects {
     repositories {
         jcenter()
         google()
+        maven {
+            url "https://raw.githubusercontent.com/guardianproject/gpmaven/master"
+        }
     }
 }

gradle.properties

@@ -35,3 +35,5 @@ org.gradle.parallel=true
 # Only relevant projects are configured which results in faster builds for large multi-projects.
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand
 org.gradle.configureondemand=true
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

-#Sat Dec 08 16:52:46 CET 2018
+#Wed Aug 19 10:44:16 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

settings.gradle

-include ':app', ':tor'
+include ':app', ':torservice'