From 9909e01c68edcadf529d309a6de23cfef2ee83c0 Mon Sep 17 00:00:00 2001 From: tronku Date: Sat, 1 Oct 2022 02:24:04 +0530 Subject: [PATCH] Updated gradle, androidx added --- build.gradle | 12 +++--------- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 3 +-- photofilterssdk/build.gradle | 10 ++++------ .../zomato/photofilters/imageprocessors/Filter.java | 3 ++- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 5a6b60c..ff45336 100644 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,16 @@ buildscript { repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:7.0.3' } } allprojects { repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() } } diff --git a/gradle.properties b/gradle.properties index 650de92..b41c69f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,3 +30,5 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=zomato POM_DEVELOPER_NAME=zomato + +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3768e09..0f80bbf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Nov 22 16:11:46 IST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/photofilterssdk/build.gradle b/photofilterssdk/build.gradle index d8f8bd3..7f535f3 100644 --- a/photofilterssdk/build.gradle +++ b/photofilterssdk/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.library' -apply from: 'maven-push.gradle' android { - compileSdkVersion 23 - buildToolsVersion "28.0.3" + compileSdkVersion 31 defaultConfig { - minSdkVersion 15 - targetSdkVersion 23 + minSdkVersion 21 + targetSdkVersion 31 versionCode 1 versionName "1.0" @@ -33,5 +31,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' - implementation 'com.android.support:appcompat-v7:23.4.0' + implementation "androidx.appcompat:appcompat:1.4.0" } diff --git a/photofilterssdk/src/main/java/com/zomato/photofilters/imageprocessors/Filter.java b/photofilterssdk/src/main/java/com/zomato/photofilters/imageprocessors/Filter.java index 7db63b0..26bae20 100644 --- a/photofilterssdk/src/main/java/com/zomato/photofilters/imageprocessors/Filter.java +++ b/photofilterssdk/src/main/java/com/zomato/photofilters/imageprocessors/Filter.java @@ -2,7 +2,8 @@ import android.graphics.Bitmap; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import com.zomato.photofilters.imageprocessors.subfilters.BrightnessSubFilter; import com.zomato.photofilters.imageprocessors.subfilters.ColorOverlaySubFilter;