From c13c737c1fbb2440c10003672e6c5d4755012a19 Mon Sep 17 00:00:00 2001
From: Westin Newell <westin@haiku.ai>
Date: Tue, 16 Jul 2019 17:02:58 -0700
Subject: [PATCH] feat(targets): update lottie-android to 3.0.1 (#206)

feat(targets): use androidx appcompat
feat(examples): use androidx appcompat and lottie 3.0.1
feat(examples): update Gradle to 3.4.2
---
 examples/lorem-ipsum/examples/android/app/build.gradle    | 4 ++--
 .../java/org/diez/examples/loremipsum/MainActivity.kt     | 2 +-
 examples/lorem-ipsum/examples/android/build.gradle        | 4 ++--
 examples/lorem-ipsum/examples/android/gradle.properties   | 3 +++
 .../poodle-surf/examples/android-java/app/build.gradle    | 2 +-
 .../android-java/app/src/main/AndroidManifest.xml         | 3 ++-
 .../org/diez/examples/poodlesurfjava/MainActivity.java    | 2 +-
 .../app/src/main/res/layout/activity_main.xml             | 4 ++--
 examples/poodle-surf/examples/android-java/build.gradle   | 8 ++++----
 .../poodle-surf/examples/android-java/gradle.properties   | 3 ++-
 examples/poodle-surf/examples/android/app/build.gradle    | 4 ++--
 .../examples/android/app/src/main/AndroidManifest.xml     | 5 +++--
 .../java/org/diez/examples/poodlesurf/MainActivity.kt     | 3 +--
 .../android/app/src/main/res/layout/activity_main.xml     | 7 ++++---
 examples/poodle-surf/examples/android/build.gradle        | 2 +-
 examples/poodle-surf/examples/android/gradle.properties   | 3 +++
 packages/targets/sources/android/bindings/Color.kt        | 2 +-
 packages/targets/sources/android/bindings/Image.kt        | 4 ++--
 packages/targets/sources/android/sdk/build.gradle         | 2 +-
 packages/targets/src/bindings/Lottie/android.ts           | 2 +-
 .../test/goldens/Bindings/diez-stub-android/build.gradle  | 4 ++--
 .../src/main/java/org/diez/Stub/Color.kt                  | 2 +-
 .../src/main/java/org/diez/Stub/Image.kt                  | 4 ++--
 .../goldens/Primitives/diez-stub-android/build.gradle     | 2 +-
 24 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/examples/lorem-ipsum/examples/android/app/build.gradle b/examples/lorem-ipsum/examples/android/app/build.gradle
index 75be112f3..96c1e8d24 100644
--- a/examples/lorem-ipsum/examples/android/app/build.gradle
+++ b/examples/lorem-ipsum/examples/android/app/build.gradle
@@ -31,10 +31,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
-    implementation "com.airbnb.android:lottie:2.7.0"
+    implementation "com.airbnb.android:lottie:3.0.1"
 
     implementation project(':diez')
 }
diff --git a/examples/lorem-ipsum/examples/android/app/src/main/java/org/diez/examples/loremipsum/MainActivity.kt b/examples/lorem-ipsum/examples/android/app/src/main/java/org/diez/examples/loremipsum/MainActivity.kt
index bd6869fd5..41835ac61 100644
--- a/examples/lorem-ipsum/examples/android/app/src/main/java/org/diez/examples/loremipsum/MainActivity.kt
+++ b/examples/lorem-ipsum/examples/android/app/src/main/java/org/diez/examples/loremipsum/MainActivity.kt
@@ -3,7 +3,7 @@ package org.diez.examples.loremipsum
 import android.content.res.Resources
 import android.graphics.drawable.PaintDrawable
 import android.graphics.drawable.shapes.RectShape
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.TypedValue
 import kotlinx.android.synthetic.main.activity_main.*
diff --git a/examples/lorem-ipsum/examples/android/build.gradle b/examples/lorem-ipsum/examples/android/build.gradle
index 04da76c42..45712bca3 100644
--- a/examples/lorem-ipsum/examples/android/build.gradle
+++ b/examples/lorem-ipsum/examples/android/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.21'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/lorem-ipsum/examples/android/gradle.properties b/examples/lorem-ipsum/examples/android/gradle.properties
index 85be9eade..250c4a464 100644
--- a/examples/lorem-ipsum/examples/android/gradle.properties
+++ b/examples/lorem-ipsum/examples/android/gradle.properties
@@ -13,3 +13,6 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/examples/poodle-surf/examples/android-java/app/build.gradle b/examples/poodle-surf/examples/android-java/app/build.gradle
index accf09f7d..d079d703b 100644
--- a/examples/poodle-surf/examples/android-java/app/build.gradle
+++ b/examples/poodle-surf/examples/android-java/app/build.gradle
@@ -30,7 +30,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
diff --git a/examples/poodle-surf/examples/android-java/app/src/main/AndroidManifest.xml b/examples/poodle-surf/examples/android-java/app/src/main/AndroidManifest.xml
index 44d5138c8..bb2f5e3a8 100644
--- a/examples/poodle-surf/examples/android-java/app/src/main/AndroidManifest.xml
+++ b/examples/poodle-surf/examples/android-java/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.diez.examples.poodlesurfjava" >
 
     <application
diff --git a/examples/poodle-surf/examples/android-java/app/src/main/java/org/diez/examples/poodlesurfjava/MainActivity.java b/examples/poodle-surf/examples/android-java/app/src/main/java/org/diez/examples/poodlesurfjava/MainActivity.java
index e648e14c4..a268b0488 100644
--- a/examples/poodle-surf/examples/android-java/app/src/main/java/org/diez/examples/poodlesurfjava/MainActivity.java
+++ b/examples/poodle-surf/examples/android-java/app/src/main/java/org/diez/examples/poodlesurfjava/MainActivity.java
@@ -1,6 +1,6 @@
 package org.diez.examples.poodlesurfjava;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 
 import org.diez.poodleSurf.*;
diff --git a/examples/poodle-surf/examples/android-java/app/src/main/res/layout/activity_main.xml b/examples/poodle-surf/examples/android-java/app/src/main/res/layout/activity_main.xml
index f3a6b6caf..6e7f99c10 100644
--- a/examples/poodle-surf/examples/android-java/app/src/main/res/layout/activity_main.xml
+++ b/examples/poodle-surf/examples/android-java/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -16,4 +16,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/examples/poodle-surf/examples/android-java/build.gradle b/examples/poodle-surf/examples/android-java/build.gradle
index e277863da..fcc5d2df9 100644
--- a/examples/poodle-surf/examples/android-java/build.gradle
+++ b/examples/poodle-surf/examples/android-java/build.gradle
@@ -5,12 +5,12 @@ buildscript {
     repositories {
         google()
         jcenter()
-        
+
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -20,7 +20,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        
+
     }
 }
 
diff --git a/examples/poodle-surf/examples/android-java/gradle.properties b/examples/poodle-surf/examples/android-java/gradle.properties
index 1d4b00532..6874ee634 100644
--- a/examples/poodle-surf/examples/android-java/gradle.properties
+++ b/examples/poodle-surf/examples/android-java/gradle.properties
@@ -16,4 +16,5 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/examples/poodle-surf/examples/android/app/build.gradle b/examples/poodle-surf/examples/android/app/build.gradle
index 23ae0c14b..6928c6fc7 100644
--- a/examples/poodle-surf/examples/android/app/build.gradle
+++ b/examples/poodle-surf/examples/android/app/build.gradle
@@ -31,12 +31,12 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:coordinatorlayout:28.0.0'
     implementation 'com.android.support:design:28.0.0'
 
-    implementation 'com.airbnb.android:lottie:2.7.0'
+    implementation 'com.airbnb.android:lottie:3.0.1'
     implementation 'de.hdodenhof:circleimageview:3.0.0'
 
     implementation project(':diez')
diff --git a/examples/poodle-surf/examples/android/app/src/main/AndroidManifest.xml b/examples/poodle-surf/examples/android/app/src/main/AndroidManifest.xml
index 6d77d64ab..7c62dfe09 100644
--- a/examples/poodle-surf/examples/android/app/src/main/AndroidManifest.xml
+++ b/examples/poodle-surf/examples/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.diez.examples.poodlesurf">
+<manifest
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        package="org.diez.examples.poodlesurf">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/examples/poodle-surf/examples/android/app/src/main/java/org/diez/examples/poodlesurf/MainActivity.kt b/examples/poodle-surf/examples/android/app/src/main/java/org/diez/examples/poodlesurf/MainActivity.kt
index 4accd3a20..ba4b6d3ec 100644
--- a/examples/poodle-surf/examples/android/app/src/main/java/org/diez/examples/poodlesurf/MainActivity.kt
+++ b/examples/poodle-surf/examples/android/app/src/main/java/org/diez/examples/poodlesurf/MainActivity.kt
@@ -2,11 +2,10 @@ package org.diez.examples.poodlesurf
 
 import android.animation.Animator
 import android.content.res.Resources
-import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.PaintDrawable
 import android.graphics.drawable.shapes.RectShape
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
diff --git a/examples/poodle-surf/examples/android/app/src/main/res/layout/activity_main.xml b/examples/poodle-surf/examples/android/app/src/main/res/layout/activity_main.xml
index f44d21320..5bf8e9d40 100644
--- a/examples/poodle-surf/examples/android/app/src/main/res/layout/activity_main.xml
+++ b/examples/poodle-surf/examples/android/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,5 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
     android:layout_width="match_parent"
@@ -12,7 +13,7 @@
         android:orientation="vertical"
         android:visibility="gone">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize">
@@ -22,7 +23,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
         <ScrollView
             android:layout_width="match_parent"
diff --git a/examples/poodle-surf/examples/android/build.gradle b/examples/poodle-surf/examples/android/build.gradle
index fd57d4335..894fec64c 100644
--- a/examples/poodle-surf/examples/android/build.gradle
+++ b/examples/poodle-surf/examples/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/examples/poodle-surf/examples/android/gradle.properties b/examples/poodle-surf/examples/android/gradle.properties
index 85be9eade..250c4a464 100644
--- a/examples/poodle-surf/examples/android/gradle.properties
+++ b/examples/poodle-surf/examples/android/gradle.properties
@@ -13,3 +13,6 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/packages/targets/sources/android/bindings/Color.kt b/packages/targets/sources/android/bindings/Color.kt
index 4e21d9b02..62ce9ecde 100644
--- a/packages/targets/sources/android/bindings/Color.kt
+++ b/packages/targets/sources/android/bindings/Color.kt
@@ -1,7 +1,7 @@
 package {{{packageName}}}
 
 import android.graphics.Color as CoreColor
-import android.support.v4.graphics.ColorUtils
+import androidx.core.graphics.ColorUtils
 
 {{> androidDataClassStart }}
 
diff --git a/packages/targets/sources/android/bindings/Image.kt b/packages/targets/sources/android/bindings/Image.kt
index 092fda098..9064c0464 100644
--- a/packages/targets/sources/android/bindings/Image.kt
+++ b/packages/targets/sources/android/bindings/Image.kt
@@ -4,8 +4,8 @@ import android.graphics.BitmapFactory
 import android.graphics.Shader
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
-import android.support.v4.content.res.ResourcesCompat
-import android.support.v7.widget.Toolbar
+import androidx.core.content.res.ResourcesCompat
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.SimpleTarget
diff --git a/packages/targets/sources/android/sdk/build.gradle b/packages/targets/sources/android/sdk/build.gradle
index 4f2d0e252..57c58e223 100644
--- a/packages/targets/sources/android/sdk/build.gradle
+++ b/packages/targets/sources/android/sdk/build.gradle
@@ -27,7 +27,7 @@ buildscript {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "com.squareup.moshi:moshi:$moshi_min_version+"
     // Note: this adapter uses a bulky and slow reflection implementation.
     // TODO: replace this with codegen-based solution.
diff --git a/packages/targets/src/bindings/Lottie/android.ts b/packages/targets/src/bindings/Lottie/android.ts
index ada3657c2..b9c1c0445 100644
--- a/packages/targets/src/bindings/Lottie/android.ts
+++ b/packages/targets/src/bindings/Lottie/android.ts
@@ -8,7 +8,7 @@ const binding: AndroidBinding<Lottie> = {
   dependencies: [{
     gradle: {
       name: 'lottie',
-      minVersion: '2.7.0',
+      minVersion: '3.0.1',
       source: 'com.airbnb.android:lottie',
     },
   }],
diff --git a/packages/targets/test/goldens/Bindings/diez-stub-android/build.gradle b/packages/targets/test/goldens/Bindings/diez-stub-android/build.gradle
index fe14a2337..d2618f1ea 100644
--- a/packages/targets/test/goldens/Bindings/diez-stub-android/build.gradle
+++ b/packages/targets/test/goldens/Bindings/diez-stub-android/build.gradle
@@ -21,12 +21,12 @@ android {
 buildscript {
     ext.moshi_min_version = '1.8.0'
     ext.glide_min_version = '4.9.0'
-    ext.lottie_min_version = '2.7.0'
+    ext.lottie_min_version = '3.0.1'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "com.squareup.moshi:moshi:$moshi_min_version+"
     // Note: this adapter uses a bulky and slow reflection implementation.
     // TODO: replace this with codegen-based solution.
diff --git a/packages/targets/test/goldens/Bindings/diez-stub-android/src/main/java/org/diez/Stub/Color.kt b/packages/targets/test/goldens/Bindings/diez-stub-android/src/main/java/org/diez/Stub/Color.kt
index 6b3d96434..234ddd322 100644
--- a/packages/targets/test/goldens/Bindings/diez-stub-android/src/main/java/org/diez/Stub/Color.kt
+++ b/packages/targets/test/goldens/Bindings/diez-stub-android/src/main/java/org/diez/Stub/Color.kt
@@ -1,7 +1,7 @@
 package org.diez.stub
 
 import android.graphics.Color as CoreColor
-import android.support.v4.graphics.ColorUtils
+import androidx.core.graphics.ColorUtils
 
 data class Color(
     val h: Float,
diff --git a/packages/targets/test/goldens/Bindings/diez-stub-android/src/main/java/org/diez/Stub/Image.kt b/packages/targets/test/goldens/Bindings/diez-stub-android/src/main/java/org/diez/Stub/Image.kt
index ddb88013f..8c225380a 100644
--- a/packages/targets/test/goldens/Bindings/diez-stub-android/src/main/java/org/diez/Stub/Image.kt
+++ b/packages/targets/test/goldens/Bindings/diez-stub-android/src/main/java/org/diez/Stub/Image.kt
@@ -4,8 +4,8 @@ import android.graphics.BitmapFactory
 import android.graphics.Shader
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
-import android.support.v4.content.res.ResourcesCompat
-import android.support.v7.widget.Toolbar
+import androidx.core.content.res.ResourcesCompat
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.target.SimpleTarget
diff --git a/packages/targets/test/goldens/Primitives/diez-stub-android/build.gradle b/packages/targets/test/goldens/Primitives/diez-stub-android/build.gradle
index 1413c997e..2c0302301 100644
--- a/packages/targets/test/goldens/Primitives/diez-stub-android/build.gradle
+++ b/packages/targets/test/goldens/Primitives/diez-stub-android/build.gradle
@@ -24,7 +24,7 @@ buildscript {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "com.squareup.moshi:moshi:$moshi_min_version+"
     // Note: this adapter uses a bulky and slow reflection implementation.
     // TODO: replace this with codegen-based solution.