Skip to content

Commit 91c6641

Browse files
committed
Version 3.5.0
1 parent 3c1710c commit 91c6641

56 files changed

Lines changed: 2326 additions & 65 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

android/app/build.gradle

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ plugins {
2727
}
2828

2929
android {
30-
namespace 'de.schliweb.bluesharpbendingapp'
31-
compileSdk 35
30+
namespace = 'de.schliweb.bluesharpbendingapp'
31+
compileSdk = 35
3232

3333
defaultConfig {
3434
applicationId "de.schliweb.bluesharpbendingapp"
35-
minSdk 28
36-
targetSdk 35
37-
versionCode 68
38-
versionName project.version.toString()
35+
minSdk = 28
36+
targetSdk = 35
37+
versionCode = 72
38+
versionName = project.version.toString()
3939

4040
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4141
}
@@ -51,17 +51,17 @@ android {
5151

5252
buildTypes {
5353
release {
54-
minifyEnabled true
55-
shrinkResources true
54+
minifyEnabled = true
55+
shrinkResources = true
5656
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
5757
}
5858
}
5959
compileOptions {
60-
sourceCompatibility JavaVersion.VERSION_17
61-
targetCompatibility JavaVersion.VERSION_17
60+
sourceCompatibility = JavaVersion.VERSION_17
61+
targetCompatibility = JavaVersion.VERSION_17
6262
}
6363
buildFeatures {
64-
viewBinding true
64+
viewBinding = true
6565
}
6666

6767
testOptions {
@@ -77,20 +77,25 @@ android {
7777

7878
dependencies {
7979
implementation 'androidx.appcompat:appcompat:1.7.1'
80-
implementation 'com.google.android.material:material:1.12.0'
80+
implementation 'com.google.android.material:material:1.13.0-rc01'
8181
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
82-
implementation 'androidx.navigation:navigation-fragment-ktx:2.9.0'
83-
implementation 'androidx.navigation:navigation-ui-ktx:2.9.0'
82+
implementation 'androidx.navigation:navigation-fragment-ktx:2.9.3'
83+
implementation 'androidx.navigation:navigation-ui-ktx:2.9.3'
8484
implementation 'androidx.core:core-splashscreen:1.0.1'
85+
implementation 'androidx.activity:activity-ktx:1.10.1'
8586
// Dependency Injection with Dagger
8687
implementation "com.google.dagger:dagger:${daggerVersion}"
8788
annotationProcessor "com.google.dagger:dagger-compiler:${daggerVersion}"
8889
implementation(project(":base"))
90+
// SLF4J API and binding to java.util.logging so logs go to Logcat
8991
implementation "org.slf4j:slf4j-api:${slf4jVersion}"
92+
implementation "org.slf4j:slf4j-jdk14:${slf4jVersion}"
9093
compileOnly "org.projectlombok:lombok:${lombokVersion}"
9194
annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
9295
implementation 'androidx.core:core-ktx:1.16.0'
9396
testImplementation 'junit:junit:4.13.2'
97+
testImplementation 'androidx.test:core:1.6.1'
98+
testImplementation 'org.robolectric:robolectric:4.13'
9499
debugImplementation "androidx.fragment:fragment-testing:1.8.8"
95100
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
96101
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

android/app/proguard-rules.pro

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,7 @@
5050

5151

5252
-keepattributes SourceFile,LineNumberTable
53+
54+
# Ensure org.json (platform or bundled) is never obfuscated or shrunk in a way that changes method names
55+
-keep class org.json.** { *; }
56+
-dontwarn org.json.**

android/app/src/main/java/de/schliweb/bluesharpbendingapp/app/BlueSharpBendingApplication.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public void initializeDependencyInjection(MainWindow mainWindow) {
7676
.baseModule(baseModule)
7777
.viewModule(viewModule)
7878
.microphoneModule(microphoneModule)
79+
.favoritesModule(new FavoritesModule(getApplicationContext()))
7980
.build();
8081

8182
// Log that dependency injection has been initialized

0 commit comments

Comments
 (0)