diff --git a/app/build.gradle b/app/build.gradle index 4b1b752..199b0ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,15 +2,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 32 defaultConfig { applicationId "com.teresaholfeld.stories.app" minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 32 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -21,14 +20,15 @@ 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 'com.github.teresaholfeld:Stories:1.1.4' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + testImplementation 'junit:junit:4.13.2' + 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" + //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:1.6.20" } repositories { mavenCentral() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d14f48e..7f28f43 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + 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..3a4f75c 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,8 @@ package com.teresaholfeld.stories.app +import android.annotation.SuppressLint 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 @@ -28,6 +29,7 @@ class MainActivity : AppCompatActivity(), StoriesProgressView.StoriesListener { private var pressTime = 0L private var limit = 500L + @SuppressLint("ClickableViewAccessibility") private val onTouchListener = View.OnTouchListener { v, event -> when (event.action) { MotionEvent.ACTION_DOWN -> { diff --git a/build.gradle b/build.gradle index 330b58c..3bfddc7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.21' + ext.kotlin_version = '1.6.20' repositories { google() jcenter() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath 'com.android.tools.build:gradle:7.1.3' + //classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' 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/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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 096f39d..0f648d8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 10 10:57:05 WEST 2018 +#Mon Mar 28 11:08:57 PKT 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index 98a57f5..e140f8f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,19 +1,18 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'com.github.dcendents.android-maven' +//apply plugin: 'com.github.dcendents.android-maven' android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 32 group = "com.teresaholfeld.stories" defaultConfig { minSdkVersion 15 - targetSdkVersion 28 + targetSdkVersion 32 versionCode 1 versionName "1.1.4" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { @@ -25,10 +24,11 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation 'com.android.support:appcompat-v7:28.0.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:1.6.20" + implementation 'androidx.appcompat:appcompat:1.4.1' + testImplementation 'junit:junit:4.13.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