diff --git a/.gitignore b/.gitignore index 62a921c..832f622 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ local.properties .env .idea +/app/release/ +/fastlane/report.xml \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 65972da..88ae8f6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "org.blackcandy.android" minSdk 26 targetSdk 34 - versionCode 1 - versionName "1.0" + versionCode 4 + versionName "1.0.0.beta1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -24,7 +24,8 @@ android { buildTypes { release { - minifyEnabled false + shrinkResources true + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -50,30 +51,30 @@ android { dependencies { def ktor_version = "2.3.4" - def media3_version = "1.2.0" + def media3_version = "1.3.1" - implementation platform('androidx.compose:compose-bom:2024.04.00') - implementation "androidx.activity:activity-compose:$activity_compose_version" + implementation platform('androidx.compose:compose-bom:2024.05.00') + implementation "androidx.activity:activity-compose:1.9.0" implementation "androidx.compose.material3:material3:1.2.1" implementation 'androidx.compose.material3:material3-window-size-class-android:1.2.1' implementation "androidx.compose.ui:ui-tooling" - implementation 'androidx.compose.ui:ui:1.6.5' + implementation 'androidx.compose.ui:ui:1.6.7' implementation "androidx.compose.ui:ui-tooling-preview" implementation 'androidx.window:window:1.2.0' implementation 'androidx.window:window-core:1.2.0' - implementation 'androidx.navigation:navigation-compose:2.5.3' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.0' - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.navigation:navigation-compose:2.7.7' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' + implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation "androidx.security:security-crypto:1.0.0" - implementation "androidx.datastore:datastore-preferences:1.0.0" + implementation "androidx.datastore:datastore-preferences:1.1.1" implementation "androidx.media3:media3-exoplayer:$media3_version" implementation "androidx.media3:media3-session:$media3_version" implementation "androidx.media3:media3-datasource-okhttp:$media3_version" - implementation 'com.google.android.material:material:1.11.0' + implementation 'com.google.android.material:material:1.12.0' implementation 'com.google.accompanist:accompanist-themeadapter-material3:0.30.1' implementation 'dev.hotwire:turbo:7.0.3' @@ -90,4 +91,4 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' -} \ No newline at end of file +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..3ed4389 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,6 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile +-dontwarn java.lang.reflect.AnnotatedType +-dontwarn org.slf4j.impl.StaticLoggerBinder \ No newline at end of file diff --git a/build.gradle b/build.gradle index ba31c81..7603603 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ buildscript { ext { compose_compiler_version = '1.4.0' - activity_compose_version = '1.6.1' } } // Top-level build file where you can add configuration options common to all sub-projects/modules.