diff --git a/build.gradle b/build.gradle
index 9d14201f..5521bf31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '2.1.10'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.13.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -22,8 +22,8 @@ allprojects {
 }
 
 ext {
-    minSdkVersion = 18
+    minSdkVersion = 21
     targetSdkVersion = 30
     compileSdkVersion = 33
-    buildToolsVersion = "33.0.1"
+    buildToolsVersion = "35.0.0"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5da9fbe6..4485cc87 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Feb 19 05:51:03 UZT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/litr-demo/build.gradle b/litr-demo/build.gradle
index 713d7210..d9de8992 100644
--- a/litr-demo/build.gradle
+++ b/litr-demo/build.gradle
@@ -36,6 +36,7 @@ android {
 
     kotlinOptions {
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        jvmTarget = "1.8"
     }
 }
 
diff --git a/litr-demo/src/main/java/com/linkedin/android/litr/demo/MainActivity.java b/litr-demo/src/main/java/com/linkedin/android/litr/demo/MainActivity.java
index 5f4ff1e5..5b9b0b90 100644
--- a/litr-demo/src/main/java/com/linkedin/android/litr/demo/MainActivity.java
+++ b/litr-demo/src/main/java/com/linkedin/android/litr/demo/MainActivity.java
@@ -73,24 +73,18 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         Intent intent = new Intent(this, InfoActivity.class);
-        switch (item.getItemId()) {
-            case R.id.device_info:
-                intent.setAction(InfoActivity.ACTION_DISPLAY_DEVICE_INFO);
-                break;
-            case R.id.capture_formats:
-                intent.setAction(InfoActivity.ACTION_DISPLAY_CAPTURE_FORMATS);
-                break;
-            case R.id.codec_list:
-                intent.setAction(InfoActivity.ACTION_DISPLAY_CODEC_LIST);
-                break;
-            case R.id.avc_encoders:
-                intent.setAction(InfoActivity.ACTION_DISPLAY_AVC_ENCODERS);
-                break;
-            case R.id.avc_decoders:
-                intent.setAction(InfoActivity.ACTION_DISPLAY_AVC_DECODERS);
-                break;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getItemId() == R.id.device_info) {
+            intent.setAction(InfoActivity.ACTION_DISPLAY_DEVICE_INFO);
+        } else if (item.getItemId() == R.id.capture_formats) {
+            intent.setAction(InfoActivity.ACTION_DISPLAY_CAPTURE_FORMATS);
+        } else if (item.getItemId() == R.id.codec_list) {
+            intent.setAction(InfoActivity.ACTION_DISPLAY_CODEC_LIST);
+        } else if (item.getItemId() == R.id.avc_encoders) {
+            intent.setAction(InfoActivity.ACTION_DISPLAY_AVC_ENCODERS);
+        } else if (item.getItemId() == R.id.avc_decoders) {
+            intent.setAction(InfoActivity.ACTION_DISPLAY_AVC_DECODERS);
+        } else {
+            return super.onOptionsItemSelected(item);
         }
         startActivity(intent);
 
diff --git a/litr-ffmpeg/build.gradle b/litr-ffmpeg/build.gradle
index 6ece76b8..bba30772 100644
--- a/litr-ffmpeg/build.gradle
+++ b/litr-ffmpeg/build.gradle
@@ -21,6 +21,7 @@ android {
 
     kotlinOptions {
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        jvmTarget = "1.8"
     }
 
     externalNativeBuild {
diff --git a/litr-filters/build.gradle b/litr-filters/build.gradle
index 8d5f3657..2e232444 100644
--- a/litr-filters/build.gradle
+++ b/litr-filters/build.gradle
@@ -26,6 +26,11 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    kotlinOptions {
+        freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        jvmTarget = "1.8"
+    }
+
     buildTypes {
         release {
             minifyEnabled false
diff --git a/litr/build.gradle b/litr/build.gradle
index 71104ef3..062e547b 100644
--- a/litr/build.gradle
+++ b/litr/build.gradle
@@ -36,6 +36,7 @@ android {
 
     kotlinOptions {
         freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+        jvmTarget = "1.8"
     }
 
     externalNativeBuild {