Skip to content

Commit fd1a6ee

Browse files
committed
Android x migration
flutter version : v1.12.13+hotfix.5 https://flutter.dev/docs/development/androidx-migration
1 parent 2057955 commit fd1a6ee

20 files changed

+96
-71
lines changed

.flutter-plugins-dependencies

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"package_info","dependencies":[]}]}

android/app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ android {
4343
targetSdkVersion 28
4444
versionCode flutterVersionCode.toInteger()
4545
versionName flutterVersionName
46-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
46+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4747
}
4848

4949
buildTypes {
@@ -111,8 +111,8 @@ dependencies {
111111
api fileTree(include: ['*.jar'], dir: 'libs')
112112
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
113113
implementation 'org.bouncycastle:bcprov-jdk15on:1.56'
114-
implementation 'com.android.support:support-v4:28.0.0'
115-
implementation 'com.android.support:appcompat-v7:28.0.0'
114+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
115+
implementation 'androidx.appcompat:appcompat:1.0.0'
116116
implementation 'org.apache.commons:commons-lang3:3.3.2'
117117
implementation 'com.lambdaworks:scrypt:1.4.0'
118118
implementation 'commons-codec:commons-codec:1.10'
@@ -128,8 +128,8 @@ dependencies {
128128
transitive = false
129129
}
130130
implementation 'org.torproject:tor-android-binary:0.3.5.8-rc-v2'
131-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
131+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
132132
testImplementation 'junit:junit:4.12'
133-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
134-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
133+
androidTestImplementation 'androidx.test:runner:1.1.0'
134+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
135135
}

android/app/src/main/kotlin/com/invertedx/sentinelx/channel/SystemChannel.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ import android.content.Context
55
import android.content.Intent
66
import android.content.pm.PackageManager
77
import android.net.Uri
8-
import android.support.v4.app.ActivityCompat
9-
import android.support.v4.content.ContextCompat
8+
import androidx.core.app.ActivityCompat
9+
import androidx.core.content.ContextCompat
1010
import com.invertedx.sentinelx.MainActivity
1111
import com.invertedx.sentinelx.SentinelxApp
1212
import com.invertedx.sentinelx.utils.SentinalPrefs
1313
import io.flutter.plugin.common.MethodCall
1414
import io.flutter.plugin.common.MethodChannel
1515
import org.bitcoinj.params.MainNetParams
1616
import org.bitcoinj.params.TestNet3Params
17-
import android.support.v4.content.ContextCompat.startActivity
18-
import android.support.v4.app.ActivityCompat.finishAffinity
19-
import android.support.v4.content.ContextCompat.startActivity
17+
import androidx.core.content.ContextCompat.startActivity
18+
import androidx.core.app.ActivityCompat.finishAffinity
19+
import androidx.core.content.ContextCompat.startActivity
2020
import android.app.AlarmManager
21-
import android.support.v4.content.ContextCompat.getSystemService
21+
import androidx.core.content.ContextCompat.getSystemService
2222
import android.app.PendingIntent
2323
import com.invertedx.sentinelx.i
2424
import io.flutter.embedding.android.SplashScreen

android/app/src/main/kotlin/com/invertedx/sentinelx/plugins/codescanner/BarcodeUtils.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
import android.graphics.Bitmap;
3232
import android.graphics.Color;
33-
import android.support.annotation.IntDef;
34-
import android.support.annotation.NonNull;
35-
import android.support.annotation.Nullable;
33+
import androidx.annotation.IntDef;
34+
import androidx.annotation.NonNull;
35+
import androidx.annotation.Nullable;
3636

3737
import com.google.zxing.BarcodeFormat;
3838
import com.google.zxing.DecodeHintType;
@@ -45,7 +45,6 @@
4545
import com.google.zxing.Result;
4646
import com.google.zxing.WriterException;
4747
import com.google.zxing.common.BitMatrix;
48-
import com.invertedx.sentinelx.plugins.codescanner.CodeScanner;
4948

5049
/**
5150
* Utils for decoding and encoding bar codes

android/app/src/main/kotlin/com/invertedx/sentinelx/plugins/codescanner/CodeScanner.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
import android.hardware.Camera.Parameters;
3333
import android.os.Handler;
3434
import android.os.Process;
35-
import android.support.annotation.MainThread;
36-
import android.support.annotation.NonNull;
37-
import android.support.annotation.Nullable;
35+
import androidx.annotation.MainThread;
36+
import androidx.annotation.NonNull;
37+
import androidx.annotation.Nullable;
3838
import android.view.SurfaceHolder;
3939

4040
import com.google.zxing.BarcodeFormat;

android/app/src/main/kotlin/com/invertedx/sentinelx/plugins/codescanner/CodeScannerException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
package com.invertedx.sentinelx.plugins.codescanner;
2525

2626
import android.os.Build;
27-
import android.support.annotation.Nullable;
28-
import android.support.annotation.RequiresApi;
27+
import androidx.annotation.Nullable;
28+
import androidx.annotation.RequiresApi;
2929

3030

3131
/**

android/app/src/main/kotlin/com/invertedx/sentinelx/plugins/codescanner/CodeScannerView.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
import android.content.res.TypedArray;
2929
import android.graphics.Color;
3030
import android.os.Build;
31-
import android.support.annotation.AttrRes;
32-
import android.support.annotation.ColorInt;
33-
import android.support.annotation.FloatRange;
34-
import android.support.annotation.NonNull;
35-
import android.support.annotation.Nullable;
36-
import android.support.annotation.Px;
37-
import android.support.annotation.RequiresApi;
38-
import android.support.annotation.StyleRes;
31+
import androidx.annotation.AttrRes;
32+
import androidx.annotation.ColorInt;
33+
import androidx.annotation.FloatRange;
34+
import androidx.annotation.NonNull;
35+
import androidx.annotation.Nullable;
36+
import androidx.annotation.Px;
37+
import androidx.annotation.RequiresApi;
38+
import androidx.annotation.StyleRes;
3939
import android.util.AttributeSet;
4040
import android.view.MotionEvent;
4141
import android.view.SurfaceView;

android/app/src/main/kotlin/com/invertedx/sentinelx/plugins/codescanner/DecodeCallback.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import android.app.Activity;
2727
import android.os.Handler;
2828
import android.os.Looper;
29-
import android.support.annotation.NonNull;
30-
import android.support.annotation.WorkerThread;
29+
import androidx.annotation.NonNull;
30+
import androidx.annotation.WorkerThread;
3131

3232
import com.google.zxing.Result;
3333

android/app/src/main/kotlin/com/invertedx/sentinelx/plugins/codescanner/DecodeTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
package com.invertedx.sentinelx.plugins.codescanner;
2525

26-
import android.support.annotation.NonNull;
27-
import android.support.annotation.Nullable;
26+
import androidx.annotation.NonNull;
27+
import androidx.annotation.Nullable;
2828

2929
import com.google.zxing.MultiFormatReader;
3030
import com.google.zxing.PlanarYUVLuminanceSource;

android/app/src/main/kotlin/com/invertedx/sentinelx/plugins/codescanner/Decoder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
package com.invertedx.sentinelx.plugins.codescanner;
2525

2626
import android.os.Process;
27-
import android.support.annotation.NonNull;
28-
import android.support.annotation.Nullable;
27+
import androidx.annotation.NonNull;
28+
import androidx.annotation.Nullable;
2929

3030
import com.google.zxing.BarcodeFormat;
3131
import com.google.zxing.DecodeHintType;

0 commit comments

Comments
 (0)