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
18 changes: 10 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ android {
lint {
abortOnError false
}
buildFeatures {
buildConfig = true
}
packagingOptions {
jniLibs {
// No need to pickFirst libc++_shared.so if all files are identical.
Expand All @@ -126,28 +129,27 @@ android {
}
namespace 'at.tomtasche.reader'
compileSdk 35
buildToolsVersion '34.0.0'

// TODO can and should this be architecture dependent?
sourceSets.main.assets.srcDirs += "build/conan/armv8/assets"
}

dependencies {
implementation platform('com.google.firebase:firebase-bom:33.3.0')
implementation platform('com.google.firebase:firebase-bom:34.1.0')
implementation 'com.google.firebase:firebase-storage'
implementation 'com.google.firebase:firebase-auth'
implementation 'com.google.firebase:firebase-crashlytics-ndk'
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-config'

implementation 'com.google.android.gms:play-services-ads:23.3.0'
implementation 'com.google.android.play:review:2.0.1'
implementation 'com.google.android.ump:user-messaging-platform:3.0.0'
implementation 'com.google.android.gms:play-services-ads:24.3.0'
implementation 'com.google.android.play:review:2.0.2'
implementation 'com.google.android.ump:user-messaging-platform:3.1.0'

implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.core:core:1.13.1'
implementation 'androidx.core:core:1.15.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.webkit:webkit:1.11.0'
implementation 'androidx.webkit:webkit:1.12.1'

implementation 'com.viliussutkus89:assetextractor-android:1.3.3'

Expand All @@ -158,7 +160,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.6.1'
// espresso-idling-resource is used in main sourceSet as well. cannot be just androidTestImplementation
implementation 'androidx.test.espresso:espresso-idling-resource:3.6.1'
implementation 'androidx.annotation:annotation:1.8.2'
implementation 'androidx.annotation:annotation:1.9.1'
}

// Without removing .cxx dir on cleanup, double gradle clean is erroring out.
Expand Down
10 changes: 2 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto"
android:versionCode="196"
android:versionName="4.0"
android:versionCode="197"
android:versionName="4.1"
tools:ignore="GoogleAppIndexingWarning">

<uses-permission android:name="android.permission.INTERNET" />
Expand Down Expand Up @@ -52,12 +52,6 @@
android:networkSecurityConfig="@xml/network_security_config"
tools:replace="android:label">

<!-- https://stackoverflow.com/a/78086604/198996 -->
<property
android:name="android.adservices.AD_SERVICES_CONFIG"
android:resource="@xml/gma_ad_services_config"
tools:replace="android:resource" />

<service
android:name="at.tomtasche.reader.background.LoaderService"
android:enabled="true"
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'com.android.application' version '8.13.1' apply false
id 'com.google.gms.google-services'version '4.4.2' apply false
id 'com.google.firebase.crashlytics' version '3.0.2' apply false
id 'com.google.gms.google-services' version '4.4.2' apply false
id 'com.google.firebase.crashlytics' version '3.0.6' apply false
id 'app.opendocument.conanandroidgradleplugin' version '0.9.6' apply false
}
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
android.enableJetifier=false
android.useAndroidX=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=true
android.nonFinalResIds=true

Expand Down
Loading