Updated SDK versions, gradle plugin and kotlin version to latest.

maulikhirani · Oct 2, 2022 · 9e2b7b3 · 9e2b7b3
1 parent 6cafe34
commit 9e2b7b3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "maulik.barcodescanner"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 32
         versionCode 6
         versionName "1.5"
 
@@ -38,30 +38,30 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'com.intuit.sdp:sdp-android:1.0.6'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.intuit.sdp:sdp-android:1.1.0'
 
     implementation 'com.google.zxing:core:3.4.1'
     // Use this dependency to bundle the model with your app
-    implementation 'com.google.mlkit:barcode-scanning:16.2.0'
+    implementation 'com.google.mlkit:barcode-scanning:17.0.2'
 
     // CameraX core library using the camera2 implementation
-    def camerax_version = "1.0.1"
+    def camerax_version = "1.2.0-beta02"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     // If you want to additionally use the CameraX Lifecycle library
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"
     // If you want to additionally use the CameraX View class
-    implementation "androidx.camera:camera-view:1.0.0-alpha27"
+    implementation "androidx.camera:camera-view:${camerax_version}"
 
     /**
      * ZXing 3.4+ uses Java 8 language features, so it is required to enable core library desugaring

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,10 +14,12 @@
         android:theme="@style/AppTheme">
         <activity android:name=".ui.BarcodeScanningActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/FullScreenTheme"/>
+            android:theme="@style/FullScreenTheme"
+            android:exported="false"/>
         <activity android:name=".ui.MainActivity"
             android:screenOrientation="sensorPortrait"
-            android:theme="@style/NoActionBarTheme">
+            android:theme="@style/NoActionBarTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/maulik/barcodescanner/ui/MainActivity.kt b/app/src/main/java/maulik/barcodescanner/ui/MainActivity.kt
@@ -76,6 +76,7 @@ class MainActivity : AppCompatActivity() {
         BarcodeScanningActivity.start(this, selectedScanningSDK)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         if (requestCode == cameraPermissionRequestCode) {

diff --git 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.5.20"
+    ext.kotlin_version = "1.7.10"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git 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-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip