Merge pull request #946 from wordpress-mobile/drop-jetifier

Drop jetifier
wordpress-mobile · Dec 13, 2021 · b77a91a · b77a91a
2 parents c4fc5a2 + c4198cc
commit b77a91a
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.aztec"
-        minSdkVersion 16
+        minSdkVersion commonMinSdkVersion
         targetSdkVersion commonTargetSdkVersion
         versionCode 1
         versionName "1.0"

diff --git a/app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt b/app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt
@@ -519,7 +519,7 @@ open class MainActivity : AppCompatActivity(),
         }
     }
 
-    override fun onSaveInstanceState(outState: Bundle?) {
+    override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
 
         if (mediaUploadDialog != null && mediaUploadDialog!!.isShowing) {

diff --git a/aztec/build.gradle b/aztec/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion commonMinSdkVersion
         targetSdkVersion commonTargetSdkVersion
         versionName "1.0"
         vectorDrawables.useSupportLibrary = true

diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/toolbar/RippleToggleButton.kt b/aztec/src/main/kotlin/org/wordpress/aztec/toolbar/RippleToggleButton.kt
@@ -9,10 +9,10 @@ import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnLongClickListener
 import android.widget.Toast
-import android.widget.ToggleButton
+import androidx.appcompat.widget.AppCompatToggleButton
 import org.wordpress.aztec.R
 
-class RippleToggleButton : ToggleButton, OnLongClickListener {
+class RippleToggleButton : AppCompatToggleButton, OnLongClickListener {
     private var mHalfWidth: Float = 0.toFloat()
     private var mAnimationIsRunning = false
     private var mTimer = 0

diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/CssStyleAttributeTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/CssStyleAttributeTest.kt
@@ -16,7 +16,7 @@ import org.wordpress.aztec.source.CssStyleFormatter
 import org.wordpress.aztec.spans.AztecStyleBoldSpan
 
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = intArrayOf(16, 21, 25))
+@Config(sdk = intArrayOf(21, 25))
 class CssStyleAttributeTest : AndroidTestCase() {
 
     private val EMPTY_STYLE_HTML = "<b>bold</b>"

diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/HtmlAttributeStyleColorTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/HtmlAttributeStyleColorTest.kt
@@ -29,7 +29,7 @@ import org.wordpress.aztec.spans.IAztecAttributedSpan
  * Also tests invalid html style attribute color properties.
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = intArrayOf(16, 21, 25))
+@Config(sdk = intArrayOf(21, 25))
 class HtmlAttributeStyleColorTest : AndroidTestCase() {
 
     private val HTML_BOLD_STYLE_COLOR = "<b style=\"color:blue;\">Blue</b>"

diff --git a/build.gradle b/build.gradle
@@ -47,16 +47,16 @@ subprojects {
 ext {
     gradlePluginVersion = '3.3.1'
     kotlinCoroutinesVersion = '1.1.0'
-    supportLibVersion = '27.1.1'
     tagSoupVersion = '1.2.1'
     glideVersion = '4.10.0'
     picassoVersion = '2.5.2'
     robolectricVersion = '4.4'
     jUnitVersion = '4.12'
     jSoupVersion = '1.11.3'
-    wordpressUtilsVersion = '1.21'
+    wordpressUtilsVersion = 'trunk-1ed207c03d2242b6fc3d74f9e388e9163cbc82a6'
     espressoVersion = '3.0.1'
     commonTargetSdkVersion = 30
+    commonMinSdkVersion = 21
 
     aztecProjectDependency = project.hasProperty("aztecVersion") ? "org.wordpress:aztec:${project.getProperty("aztecVersion")}" : project(":aztec")
 }
diff --git a/glide-loader/build.gradle b/glide-loader/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion commonMinSdkVersion
         targetSdkVersion commonTargetSdkVersion
         versionCode 1
         versionName "1.0"

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 org.gradle.jvmargs=-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-android.enableJetifier=true
+android.enableJetifier=false
 android.useAndroidX=true
 
 

diff --git a/picasso-loader/build.gradle b/picasso-loader/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion commonMinSdkVersion
         targetSdkVersion commonTargetSdkVersion
         versionCode 1
         versionName "1.0"

diff --git a/wordpress-comments/build.gradle b/wordpress-comments/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion commonMinSdkVersion
         targetSdkVersion commonTargetSdkVersion
         versionName "1.0"
         vectorDrawables.useSupportLibrary = true

diff --git a/wordpress-shortcodes/build.gradle b/wordpress-shortcodes/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion commonMinSdkVersion
         targetSdkVersion commonTargetSdkVersion
         versionName "1.0"
     }