From ee5a1cd758295b7a9c4d61ca08b5ddf64d847e3f Mon Sep 17 00:00:00 2001
From: Adetayo Olaitan <olaitan.adetayo@gmail.com>
Date: Fri, 17 Sep 2021 09:50:16 +0100
Subject: [PATCH] migrated to android x

---
 app/build.gradle                              | 20 +++++++++----------
 .../teresaholfeld/stories/app/MainActivity.kt |  6 +++---
 gradle.properties                             |  2 ++
 library/build.gradle                          | 14 ++++++-------
 .../stories/StoriesProgressView.kt            |  2 +-
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4b1b752..2498f77 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-  compileSdkVersion 28
-  buildToolsVersion '28.0.3'
+  compileSdkVersion 30
+  buildToolsVersion '30.0.3'
   defaultConfig {
     applicationId "com.teresaholfeld.stories.app"
-    minSdkVersion 15
-    targetSdkVersion 28
+    minSdkVersion 26
+    targetSdkVersion 30
     versionCode 1
     versionName "1.0"
-    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
   }
   buildTypes {
     release {
@@ -21,11 +21,11 @@ android {
 }
 
 dependencies {
-  implementation 'com.github.teresaholfeld:Stories:1.1.2'
-  implementation 'com.android.support:appcompat-v7:28.0.0'
-  implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-  testImplementation 'junit:junit:4.12'
-  androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+  implementation 'androidx.appcompat:appcompat:1.3.1'
+  implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation project(path: ':library')
+    testImplementation 'junit:junit:4.12'
+  androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
     exclude group: 'com.android.support', module: 'support-annotations'
   })
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/app/src/main/java/com/teresaholfeld/stories/app/MainActivity.kt b/app/src/main/java/com/teresaholfeld/stories/app/MainActivity.kt
index 7172626..11e97e4 100644
--- a/app/src/main/java/com/teresaholfeld/stories/app/MainActivity.kt
+++ b/app/src/main/java/com/teresaholfeld/stories/app/MainActivity.kt
@@ -1,7 +1,7 @@
 package com.teresaholfeld.stories.app
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
@@ -48,7 +48,7 @@ class MainActivity : AppCompatActivity(), StoriesProgressView.StoriesListener {
         super.onCreate(savedInstanceState)
         window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
         setContentView(R.layout.activity_main)
-
+        storiesProgressView = findViewById<View>(R.id.stories) as StoriesProgressView
         storiesProgressView?.setStoriesCount(PROGRESS_COUNT)
         storiesProgressView?.setStoryDuration(3000L)
         // or
@@ -56,7 +56,7 @@ class MainActivity : AppCompatActivity(), StoriesProgressView.StoriesListener {
 
         storiesProgressView?.setStoriesListener(this)
 
-        counter = 2
+        counter = 1
         storiesProgressView?.startStories(counter)
 
         image = findViewById<View>(R.id.image) as ImageView
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- 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/library/build.gradle b/library/build.gradle
index 98a57f5..3a88b1c 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -3,17 +3,17 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-  compileSdkVersion 28
+  compileSdkVersion 30
   buildToolsVersion '28.0.3'
   group = "com.teresaholfeld.stories"
 
   defaultConfig {
-    minSdkVersion 15
-    targetSdkVersion 28
+    minSdkVersion 21
+    targetSdkVersion 30
     versionCode 1
     versionName "1.1.4"
 
-    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
   }
   buildTypes {
@@ -25,10 +25,10 @@ android {
 }
 
 dependencies {
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-  implementation 'com.android.support:appcompat-v7:28.0.0'
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31"
+  implementation 'androidx.appcompat:appcompat:1.3.1'
   testImplementation 'junit:junit:4.12'
-  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'
   })
 }
diff --git a/library/src/main/java/com/teresaholfeld/stories/StoriesProgressView.kt b/library/src/main/java/com/teresaholfeld/stories/StoriesProgressView.kt
index 36d3f5f..69275ad 100644
--- a/library/src/main/java/com/teresaholfeld/stories/StoriesProgressView.kt
+++ b/library/src/main/java/com/teresaholfeld/stories/StoriesProgressView.kt
@@ -5,7 +5,7 @@ package com.teresaholfeld.stories
 import android.annotation.TargetApi
 import android.content.Context
 import android.os.Build
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout