From 8c22acaad278968b96d98e0566d07433d5d11285 Mon Sep 17 00:00:00 2001 From: Ashiq Date: Wed, 9 Mar 2022 12:42:58 +0600 Subject: [PATCH] Android dependency updated --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 6 ++---- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 12 ------------ app/build.gradle | 5 ++--- app/src/main/AndroidManifest.xml | 3 ++- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- propicker/build.gradle | 18 ++++++++---------- propicker/src/main/AndroidManifest.xml | 2 ++ 10 files changed, 21 insertions(+), 35 deletions(-) delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130..fb7f4a8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 876291b..0766809 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,11 +4,10 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..ef61796 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 853c1ef..81c05a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,13 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 30 - buildToolsVersion "30.0.2" + compileSdkVersion 32 defaultConfig { applicationId "com.shaon2016.propickersample" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6c4c9ab..84282f5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,8 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> - + diff --git a/build.gradle b/build.gradle index 73d2774..71e100b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.4.30" + ext.kotlin_version = "1.6.10" repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 256a24b..08d331e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip diff --git a/propicker/build.gradle b/propicker/build.gradle index e6bf7ed..ccecbcc 100644 --- a/propicker/build.gradle +++ b/propicker/build.gradle @@ -4,14 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 30 + compileSdkVersion 32 buildToolsVersion "30.0.3" defaultConfig { minSdkVersion 19 - targetSdkVersion 30 - versionCode 1 - versionName "1.0" + targetSdkVersion 32 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -37,25 +35,25 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.4.1' // Inline activity result implementation 'com.github.florent37:inline-activity-result-kotlin:1.0.4' // For lifecyclescope - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' - implementation 'androidx.activity:activity:1.2.0-beta02' - implementation 'androidx.fragment:fragment:1.3.0-beta02' + implementation 'androidx.activity:activity-ktx:1.5.0-alpha03' + implementation 'androidx.fragment:fragment-ktx:1.5.0-alpha03' // implementation 'androidx.legacy:legacy-support-v4:1.0.0' // CameraX Library - def camerax_version = "1.0.0-beta12" + def camerax_version = "1.1.0-beta02" // CameraX core library using camera2 implementation implementation "androidx.camera:camera-camera2:$camerax_version" // CameraX Lifecycle Library implementation "androidx.camera:camera-lifecycle:$camerax_version" // CameraX View class - implementation "androidx.camera:camera-view:1.0.0-alpha19" + implementation "androidx.camera:camera-view:$camerax_version" // Ucrop implementation 'com.github.yalantis:ucrop:2.2.6' diff --git a/propicker/src/main/AndroidManifest.xml b/propicker/src/main/AndroidManifest.xml index 3ab8049..ebf30ad 100644 --- a/propicker/src/main/AndroidManifest.xml +++ b/propicker/src/main/AndroidManifest.xml @@ -11,10 +11,12 @@