Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
}
Expand All @@ -22,8 +22,8 @@ allprojects {
}

ext {
minSdkVersion = 18
minSdkVersion = 21
targetSdkVersion = 30
compileSdkVersion = 33
buildToolsVersion = "33.0.1"
buildToolsVersion = "35.0.0"
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions litr-demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ android {

kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
jvmTarget = "1.8"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 1 addition & 0 deletions litr-ffmpeg/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ android {

kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
jvmTarget = "1.8"
}

externalNativeBuild {
Expand Down
5 changes: 5 additions & 0 deletions litr-filters/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
jvmTarget = "1.8"
}

buildTypes {
release {
minifyEnabled false
Expand Down
1 change: 1 addition & 0 deletions litr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ android {

kotlinOptions {
freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
jvmTarget = "1.8"
}

externalNativeBuild {
Expand Down
Loading