Skip to content

Commit 0da4e19

Browse files
syakimchiksyakimchik
committed
migrate to androidX
1 parent 30102d9 commit 0da4e19

14 files changed

Lines changed: 55 additions & 64 deletions

File tree

‎Samples/Advanced/DocumentReader-Kotlin/app/build.gradle‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@ plugins {
44
}
55

66
android {
7-
allprojects {
8-
repositories {
9-
maven {
10-
url "http://maven.regulaforensics.com/RegulaDocumentReader"
11-
}
12-
}
13-
}
14-
157
compileSdkVersion 30
168
buildToolsVersion "30.0.3"
179

‎Samples/Advanced/DocumentReader-Kotlin/build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.2.1'
9+
classpath 'com.android.tools.build:gradle:4.2.2'
1010
//noinspection DifferentKotlinGradleVersion
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

@@ -19,6 +19,9 @@ allprojects {
1919
repositories {
2020
google()
2121
mavenCentral()
22+
maven {
23+
url "http://maven.regulaforensics.com/RegulaDocumentReader"
24+
}
2225
}
2326
}
2427

‎Samples/Basic/DocumentReader-sample/app/build.gradle‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,14 @@ apply plugin: 'com.android.application'
22

33
android {
44

5-
allprojects{
6-
repositories{
7-
maven {
8-
url "http://maven.regulaforensics.com/RegulaDocumentReader"
9-
}
10-
}
11-
}
12-
135
compileSdkVersion 30
146
defaultConfig {
157
applicationId "com.regula.documentreader"
168
minSdkVersion 19
179
targetSdkVersion 30
1810
versionCode 1
1911
versionName "1.0"
20-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2113
}
2214
buildTypes {
2315
release {
@@ -30,12 +22,12 @@ android {
3022
dependencies {
3123
implementation fileTree(dir: 'libs', include: ['*.jar'])
3224
//noinspection GradleCompatible
33-
implementation 'com.android.support:appcompat-v7:27.1.1'
34-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
25+
implementation 'androidx.appcompat:appcompat:1.3.1'
26+
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
3527

36-
testImplementation 'junit:junit:4.12'
37-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
38-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
28+
testImplementation 'junit:junit:4.13.2'
29+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
30+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
3931

4032
implementation 'com.regula.documentreader.core:fullrfid:5.7.+@aar'
4133
implementation('com.regula.documentreader:api:5.7.+@aar') {

‎Samples/Basic/DocumentReader-sample/app/src/androidTest/java/com/regula/documentreader/ExampleInstrumentedTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.regula.documentreader;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

‎Samples/Basic/DocumentReader-sample/app/src/main/java/com/regula/documentreader/MainActivity.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import android.graphics.Color;
1212
import android.net.Uri;
1313
import android.os.Bundle;
14-
import android.support.annotation.NonNull;
15-
import android.support.annotation.Nullable;
16-
import android.support.v4.app.ActivityCompat;
17-
import android.support.v4.content.ContextCompat;
18-
import android.support.v7.app.AlertDialog;
19-
import android.support.v7.app.AppCompatActivity;
14+
import androidx.annotation.NonNull;
15+
import androidx.annotation.Nullable;
16+
import androidx.core.app.ActivityCompat;
17+
import androidx.core.content.ContextCompat;
18+
import androidx.appcompat.app.AlertDialog;
19+
import androidx.appcompat.app.AppCompatActivity;
2020
import android.util.Log;
2121
import android.view.View;
2222
import android.view.ViewGroup;
@@ -35,7 +35,6 @@
3535
import com.regula.documentreader.api.completions.IDocumentReaderPrepareCompletion;
3636
import com.regula.documentreader.api.enums.DocReaderAction;
3737
import com.regula.documentreader.api.enums.eGraphicFieldType;
38-
import com.regula.documentreader.api.enums.eRFID_Password_Type;
3938
import com.regula.documentreader.api.enums.eVisualFieldType;
4039
import com.regula.documentreader.api.errors.DocumentReaderException;
4140
import com.regula.documentreader.api.results.DocumentReaderResults;

‎Samples/Basic/DocumentReader-sample/build.gradle‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@
33
buildscript {
44

55
repositories {
6+
mavenCentral()
67
google()
7-
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.5.0'
10+
classpath 'com.android.tools.build:gradle:4.2.2'
1111
}
1212
}
1313

1414
allprojects {
1515
repositories {
1616
google()
17-
jcenter()
17+
mavenCentral()
18+
maven {
19+
url "http://maven.regulaforensics.com/RegulaDocumentReader"
20+
}
1821
}
1922
}
2023

‎Samples/Basic/DocumentReader-sample/gradle.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12+
android.enableJetifier=true
13+
android.useAndroidX=true
1214
org.gradle.jvmargs=-Xmx1536m
1315

1416
# When configured, Gradle will run in incubating parallel mode.

‎Samples/Basic/DocumentReader-sample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎Samples/Basic/DocumentReader-sample_kotlin/app/build.gradle‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
allprojects{
9-
repositories{
10-
maven {
11-
url "http://maven.regulaforensics.com/RegulaDocumentReader"
12-
}
13-
}
14-
}
158
compileSdkVersion 30
169
defaultConfig {
1710
applicationId "com.regula.documentreader"
1811
minSdkVersion 19
1912
targetSdkVersion 30
2013
versionCode 1
2114
versionName "1.0"
22-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2316
}
2417
buildTypes {
2518
release {
@@ -32,15 +25,16 @@ android {
3225
dependencies {
3326
implementation fileTree(dir: 'libs', include: ['*.jar'])
3427
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
35-
//noinspection GradleCompatible
36-
implementation 'com.android.support:appcompat-v7:28.0.0'
37-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
28+
implementation 'androidx.appcompat:appcompat:1.3.1'
29+
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
3830

39-
testImplementation 'junit:junit:4.12'
40-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
41-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
31+
testImplementation 'junit:junit:4.13.2'
32+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
33+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
4234

35+
//noinspection GradleDynamicVersion
4336
implementation 'com.regula.documentreader.core:fullrfid:5.7.+@aar'
37+
//noinspection GradleDynamicVersion
4438
implementation('com.regula.documentreader:api:5.7.+@aar') {
4539
transitive = true;
4640
}

‎Samples/Basic/DocumentReader-sample_kotlin/app/src/androidTest/java/com/regula/documentreader/ExampleInstrumentedTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.regula.documentreader
22

3-
import android.support.test.InstrumentationRegistry
4-
import android.support.test.runner.AndroidJUnit4
3+
import androidx.test.platform.app.InstrumentationRegistry
4+
import androidx.test.ext.junit.runners.AndroidJUnit4
55

66
import org.junit.Test
77
import org.junit.runner.RunWith

0 commit comments

Comments
 (0)