diff --git a/app/build.gradle b/app/build.gradle index cb7156c..755ac6a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,20 +23,18 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = '11' } useLibrary 'android.test.base' } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion" implementation "androidx.appcompat:appcompat:$appCompatVersion" implementation project(':library') - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} -repositories { - mavenCentral() } diff --git a/build.gradle b/build.gradle index 68355fd..e639928 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.21' + ext.kotlin_version = '1.5.0' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' - classpath 'com.github.dcendents:android-maven-plugin:1.2' + classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong @@ -18,19 +16,14 @@ buildscript { } allprojects { - repositories { - google() - jcenter() - } ext { - androidBuildToolsVersion = "30.0.2" - androidMinSdkVersion = 14 + androidBuildToolsVersion = "30.0.3" + androidMinSdkVersion = 16 androidTargetSdkVersion = 30 androidCompileSdkVersion = 30 - appCompatVersion = "1.2.0" - constraintLayoutVersion = "2.0.0" - materialDesignVersion = "1.2.1" + constraintLayoutVersion = "2.0.4" + materialDesignVersion = "1.3.0" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0789fef..cc6f785 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jan 18 01:54:45 BRT 2021 +#Fri May 14 20:51:21 MSK 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index 8503853..1cba062 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -33,12 +33,12 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 11 + targetCompatibility = 11 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } useLibrary 'android.test.runner' @@ -47,17 +47,14 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.appcompat:appcompat:$appCompatVersion" implementation "com.google.android.material:material:$materialDesignVersion" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" androidTestImplementation 'androidx.test:runner:1.3.0' androidTestImplementation 'androidx.test:rules:1.3.0' // Assertions - androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.ext:truth:1.3.0' - androidTestImplementation 'com.google.truth:truth:1.0' + androidTestImplementation 'com.google.truth:truth:1.1.2' // Espresso androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' } diff --git a/library/src/main/java/br/com/mauker/materialsearchview/utils/AnimationUtils.kt b/library/src/main/java/br/com/mauker/materialsearchview/utils/AnimationUtils.kt index 430bb1b..0b89cb2 100644 --- a/library/src/main/java/br/com/mauker/materialsearchview/utils/AnimationUtils.kt +++ b/library/src/main/java/br/com/mauker/materialsearchview/utils/AnimationUtils.kt @@ -102,13 +102,13 @@ object AnimationUtils { fun fadeOutView(view: View, duration: Int = ANIMATION_DURATION_SHORTEST) { ViewCompat.animate(view).alpha(0f).setDuration(duration.toLong()).setListener(object : ViewPropertyAnimatorListener { override fun onAnimationStart(view: View) { - view.isDrawingCacheEnabled = true + //view.isDrawingCacheEnabled = true } override fun onAnimationEnd(view: View) { view.visibility = View.GONE view.alpha = 1f - view.isDrawingCacheEnabled = false + //view.isDrawingCacheEnabled = false } override fun onAnimationCancel(view: View) {} diff --git a/settings.gradle b/settings.gradle index 3306997..f2bd70d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,8 @@ +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app', ':library'