Merge pull request #79 from StringCare/develop

Develop
StringCare · Sep 2, 2020 · 5f8590c · 5f8590c
2 parents 4128d62 + cf08c2b
commit 5f8590c
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 27 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,13 +14,12 @@ android {
     signingConfigs {
 
     }
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "com.efraespada.stringobfuscator"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -49,6 +48,10 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+
+    aaptOptions {
+        noCompress "json"
+    }
 }
 
 repositories {
@@ -58,10 +61,10 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     testImplementation 'junit:junit:4.12'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'commons-io:commons-io:2.5'

diff --git a/app/src/androidTest/java/com/efraespada/stringobfuscator/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/efraespada/stringobfuscator/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.efraespada.stringobfuscator;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/java/com/efraespada/stringobfuscator/MainActivity.java b/app/src/main/java/com/efraespada/stringobfuscator/MainActivity.java
@@ -1,7 +1,7 @@
 package com.efraespada.stringobfuscator;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 
 import com.stringcare.library.SC;
@@ -44,7 +44,9 @@ protected void onCreate(Bundle savedInstanceState) {
         ((TextView) findViewById(R.id.same_value)).setText(areEquals);
 
         String jsonObjectName = SC.reveal(R.string.asset_json_file);
-        SC.asset().asyncJson(jsonObjectName, json -> ((TextView) findViewById(R.id.json_object)).setText(json.toString()));
+        SC.asset().asyncJson(jsonObjectName, json ->
+                ((TextView) findViewById(R.id.json_object)).setText(json.toString())
+        );
         SC.asset().asyncBytes(jsonObjectName, bytes -> ((TextView) findViewById(R.id.json_object_original)).setText(new String(bytes)), false);
 
         String jsonArrayName = SC.reveal(R.string.asset_json_raw_file);

diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,9 @@
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.4.0'
 
     ext {
-        stringcare_version = '4.0.0'
+        stringcare_version = '4.0.1'
     }
 
     repositories {
@@ -18,11 +18,12 @@ buildscript {
     dependencies {
         classpath "com.stringcare:plugin:$stringcare_version"
         // classpath files('../KotlinGradlePlugin/build/libs/plugin-4.0.0.jar')
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
+        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
+
 }
 
 allprojects {

diff --git a/gradle.properties b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -4,18 +4,17 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "4.0.0"
+version = "4.0.1"
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 4
         versionName version
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         externalNativeBuild {
             cmake {
                 cppFlags "-fexceptions"
@@ -38,14 +37,15 @@ android {
             path "CMakeLists.txt"
         }
     }
+    ndkVersion '21.3.6528147'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'org.jetbrains.anko:anko:0.10.8'
     implementation 'org.apache.commons:commons-lang3:3.9'
     testImplementation 'junit:junit:4.12'

diff --git a/library/src/androidTest/java/com/efraespada/stringcarelibrary/ExampleInstrumentedTest.java b/library/src/androidTest/java/com/efraespada/stringcarelibrary/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.efraespada.stringcarelibrary;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/library/src/main/java/com/stringcare/library/CPlusLogic.kt b/library/src/main/java/com/stringcare/library/CPlusLogic.kt
@@ -2,7 +2,7 @@ package com.stringcare.library
 
 import android.content.Context
 import android.content.res.Resources
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import java.nio.charset.Charset
 import kotlin.Exception
 

diff --git a/library/src/main/java/com/stringcare/library/JavaLogic.kt b/library/src/main/java/com/stringcare/library/JavaLogic.kt
@@ -2,7 +2,7 @@ package com.stringcare.library
 
 import android.content.Context
 import android.content.res.Resources
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import java.nio.charset.Charset
 import javax.crypto.Cipher
 import javax.crypto.spec.SecretKeySpec

diff --git a/library/src/main/java/com/stringcare/library/SC.kt b/library/src/main/java/com/stringcare/library/SC.kt
@@ -1,7 +1,7 @@
 package com.stringcare.library
 
 import android.content.Context
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import android.util.Log
 import org.jetbrains.anko.doAsync
 import org.json.JSONArray

diff --git a/library/src/main/java/com/stringcare/library/SCTextView.java b/library/src/main/java/com/stringcare/library/SCTextView.java
@@ -1,7 +1,7 @@
 package com.stringcare.library;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.text.Html;
 import android.util.AttributeSet;