diff --git a/receivers/android/.gitignore b/receivers/android/.gitignore index aa724b7..c1d077d 100644 --- a/receivers/android/.gitignore +++ b/receivers/android/.gitignore @@ -7,9 +7,14 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/* .DS_Store /build /captures .externalNativeBuild .cxx local.properties + +/app/defaultFlavor +/app/playstore + diff --git a/receivers/android/app/build.gradle b/receivers/android/app/build.gradle index 89665eb..7e320dd 100644 --- a/receivers/android/app/build.gradle +++ b/receivers/android/app/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' - id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.10' + id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.0' } ext { @@ -20,12 +20,12 @@ if (keystorePropertiesFile.exists()) { android { namespace 'com.futo.fcast.receiver' - compileSdk 34 + compileSdk 36 defaultConfig { applicationId "com.futo.fcast.receiver" minSdk 24 - targetSdk 34 + targetSdk 36 versionCode currentVersionCode versionName currentVersionName @@ -69,11 +69,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = '1.8' + sourceCompatibility JavaVersion.VERSION_21 + targetCompatibility JavaVersion.VERSION_21 } buildFeatures { buildConfig true @@ -84,18 +81,18 @@ android { } dependencies { - implementation 'androidx.core:core-ktx:1.12.0' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.11.0' - implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" - implementation 'androidx.media3:media3-exoplayer:1.2.0' - implementation "com.squareup.okhttp3:okhttp:4.11.0" + implementation 'androidx.core:core-ktx:1.16.0' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'com.google.android.material:material:1.12.0' + implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" + implementation 'androidx.media3:media3-exoplayer:1.7.1' + implementation "com.squareup.okhttp3:okhttp:5.1.0" implementation 'com.journeyapps:zxing-android-embedded:4.3.0' - implementation 'org.java-websocket:Java-WebSocket:1.5.4' - implementation 'androidx.media3:media3-ui:1.2.0' - implementation 'androidx.media3:media3-exoplayer-dash:1.2.0' - implementation 'androidx.media3:media3-exoplayer-hls:1.2.0' + implementation 'org.java-websocket:Java-WebSocket:1.6.0' + implementation 'androidx.media3:media3-ui:1.7.1' + implementation 'androidx.media3:media3-exoplayer-dash:1.7.1' + implementation 'androidx.media3:media3-exoplayer-hls:1.7.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' } diff --git a/receivers/android/build.gradle b/receivers/android/build.gradle index a7ea160..853cdbc 100644 --- a/receivers/android/build.gradle +++ b/receivers/android/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.2.0' apply false - id 'com.android.library' version '8.2.0' apply false - id 'org.jetbrains.kotlin.android' version '1.8.0' apply false + id 'com.android.application' version '8.11.0' apply false + id 'com.android.library' version '8.11.0' apply false + id 'org.jetbrains.kotlin.android' version '2.2.0' apply false } \ No newline at end of file diff --git a/receivers/android/gradle/wrapper/gradle-wrapper.properties b/receivers/android/gradle/wrapper/gradle-wrapper.properties index 14ad7bf..0f65ab0 100644 --- a/receivers/android/gradle/wrapper/gradle-wrapper.properties +++ b/receivers/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon May 01 06:24:43 CDT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME