Skip to content

Commit 6fb8987

Browse files
committed
migrated to androidX components
1 parent c793d84 commit 6fb8987

File tree

11 files changed

+22
-21
lines changed

11 files changed

+22
-21
lines changed

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ android {
1414
signingConfigs {
1515

1616
}
17-
compileSdkVersion 29
17+
compileSdkVersion 30
1818

1919
defaultConfig {
2020
applicationId "com.efraespada.stringobfuscator"
2121
minSdkVersion 15
22-
targetSdkVersion 29
22+
targetSdkVersion 30
2323
versionCode 1
2424
versionName "1.0"
2525
}
@@ -57,10 +57,10 @@ repositories {
5757

5858
dependencies {
5959
implementation fileTree(include: ['*.jar'], dir: 'libs')
60-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
60+
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
6161
exclude group: 'com.android.support', module: 'support-annotations'
6262
})
63-
implementation 'com.android.support:appcompat-v7:29.0.0'
63+
implementation 'androidx.appcompat:appcompat:1.2.0'
6464
testImplementation 'junit:junit:4.12'
6565
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
6666
implementation 'commons-io:commons-io:2.5'

app/src/androidTest/java/com/efraespada/stringobfuscator/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.efraespada.stringobfuscator;
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;

app/src/main/java/com/efraespada/stringobfuscator/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.efraespada.stringobfuscator;
22

33
import android.os.Bundle;
4-
import android.support.v7.app.AppCompatActivity;
4+
import androidx.appcompat.app.AppCompatActivity;
55
import android.widget.TextView;
66

77
import com.stringcare.library.SC;

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ buildscript {
1616
}
1717

1818
dependencies {
19-
classpath "com.stringcare:plugin:$stringcare_version"
20-
// classpath files('../KotlinGradlePlugin/build/libs/plugin-4.0.0.jar')
19+
// classpath "com.stringcare:plugin:$stringcare_version"
20+
classpath files('../KotlinGradlePlugin/build/libs/plugin-4.0.0.jar')
2121
classpath 'com.android.tools.build:gradle:4.0.1'
2222
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
2323
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

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.

library/build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ apply plugin: 'com.jfrog.bintray'
77
version = "4.0.0"
88

99
android {
10-
compileSdkVersion 28
11-
buildToolsVersion '28.0.3'
10+
compileSdkVersion 30
1211

1312
defaultConfig {
1413
minSdkVersion 15
15-
targetSdkVersion 28
14+
targetSdkVersion 30
1615
versionCode 4
1716
versionName version
18-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
17+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1918
externalNativeBuild {
2019
cmake {
2120
cppFlags "-fexceptions"
@@ -43,10 +42,10 @@ android {
4342

4443
dependencies {
4544
implementation fileTree(dir: 'libs', include: ['*.jar'])
46-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
45+
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
4746
exclude group: 'com.android.support', module: 'support-annotations'
4847
})
49-
implementation 'com.android.support:appcompat-v7:28.0.0'
48+
implementation 'androidx.appcompat:appcompat:1.2.0'
5049
implementation 'org.jetbrains.anko:anko:0.10.8'
5150
implementation 'org.apache.commons:commons-lang3:3.9'
5251
testImplementation 'junit:junit:4.12'

library/src/androidTest/java/com/efraespada/stringcarelibrary/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.efraespada.stringcarelibrary;
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;

library/src/main/java/com/stringcare/library/CPlusLogic.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.stringcare.library
22

33
import android.content.Context
44
import android.content.res.Resources
5-
import android.support.annotation.StringRes
5+
import androidx.annotation.StringRes
66
import java.nio.charset.Charset
77
import kotlin.Exception
88

library/src/main/java/com/stringcare/library/JavaLogic.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.stringcare.library
22

33
import android.content.Context
44
import android.content.res.Resources
5-
import android.support.annotation.StringRes
5+
import androidx.annotation.StringRes
66
import java.nio.charset.Charset
77
import javax.crypto.Cipher
88
import javax.crypto.spec.SecretKeySpec

library/src/main/java/com/stringcare/library/SC.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.stringcare.library
22

33
import android.content.Context
4-
import android.support.annotation.StringRes
4+
import androidx.annotation.StringRes
55
import android.util.Log
66
import org.jetbrains.anko.doAsync
77
import org.json.JSONArray

library/src/main/java/com/stringcare/library/SCTextView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.stringcare.library;
22

33
import android.content.Context;
4-
import android.support.v7.widget.AppCompatTextView;
4+
import androidx.appcompat.widget.AppCompatTextView;
55
import android.text.Html;
66
import android.util.AttributeSet;
77

0 commit comments

Comments
 (0)