Merge pull request #108 from st235/feature/dependencies-bump

st235 · web-flow · commit e0b279ddc4ef · 2026-05-05T22:12:01.000+01:00
Feature/dependencies bump
diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml
@@ -36,9 +36,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      - name: Run ABI Check
-        run: ./gradlew apiCheck
-
       - name: Run Dependency Check
         run: ./gradlew dependencyGuard
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
 
 android {
-    namespace 'github.com.st235.expandablebottombar'
+    namespace 'github.com.st235.expandablebottombar.app'
 
     defaultConfig {
         applicationId 'github.com.st235.expandablebottombar'
         minSdkVersion 21
-        targetSdkVersion 34
-        compileSdk 34
+        targetSdkVersion 37
+        compileSdk 37
         versionCode 1
     }
 
@@ -26,24 +25,21 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     kotlin {
         jvmToolchain(17)
     }
 }
 
 dependencies {
     implementation project(':expandablebottombar')
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10'
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'com.google.android.material:material:1.13.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
 
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.7.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.8'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.9.8'
 
-    implementation 'com.squareup.picasso:picasso:2.8'
+    implementation 'com.squareup.picasso:picasso:2.71828'
 }
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/ShowCaseActivity.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/ShowCaseActivity.kt
@@ -1,13 +1,19 @@
-package github.com.st235.expandablebottombar
+package github.com.st235.expandablebottombar.app
 
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import github.com.st235.expandablebottombar.screens.*
-import github.com.st235.expandablebottombar.screens.navigation.NavigationComponentActivity
+import github.com.st235.expandablebottombar.app.screens.navigation.NavigationComponentActivity
+import github.com.st235.expandablebottombar.app.screens.CoordinatorLayoutActivity
+import github.com.st235.expandablebottombar.app.screens.JavaActivity
+import github.com.st235.expandablebottombar.app.screens.NotificationBadgeActivity
+import github.com.st235.expandablebottombar.app.screens.ProgrammaticallyCreatedDemoActivity
+import github.com.st235.expandablebottombar.app.screens.ScrollableCoordinatorLayoutActivity
+import github.com.st235.expandablebottombar.app.screens.StylesActivity
+import github.com.st235.expandablebottombar.app.screens.XmlDeclaredActivity
 
 class ShowCaseActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/ShowCaseAdapter.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/ShowCaseAdapter.kt
@@ -1,4 +1,4 @@
-package github.com.st235.expandablebottombar
+package github.com.st235.expandablebottombar.app
 
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/ShowCaseInfo.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/ShowCaseInfo.kt
@@ -1,4 +1,4 @@
-package github.com.st235.expandablebottombar
+package github.com.st235.expandablebottombar.app
 
 data class ShowCaseInfo(
     val title: String,
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/CoordinatorLayoutActivity.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/CoordinatorLayoutActivity.kt
@@ -1,10 +1,10 @@
-package github.com.st235.expandablebottombar.screens
+package github.com.st235.expandablebottombar.app.screens
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 
 class CoordinatorLayoutActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/JavaActivity.java b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/JavaActivity.java
@@ -1,12 +1,12 @@
-package github.com.st235.expandablebottombar.screens;
+package github.com.st235.expandablebottombar.app.screens;
 
 import android.graphics.Color;
 import android.os.Bundle;
 import android.util.Log;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import github.com.st235.expandablebottombar.R;
+import github.com.st235.expandablebottombar.app.R;
 import github.com.st235.expandablebottombar.ExpandableBottomBar;
 import github.com.st235.expandablebottombar.Menu;
 import github.com.st235.expandablebottombar.MenuItemDescriptor;
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/NotificationBadgeActivity.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/NotificationBadgeActivity.kt
@@ -1,4 +1,4 @@
-package github.com.st235.expandablebottombar.screens
+package github.com.st235.expandablebottombar.app.screens
 
 import android.graphics.Color
 import android.os.Bundle
@@ -9,7 +9,7 @@ import android.view.ViewAnimationUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.graphics.ColorUtils
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 import github.com.st235.expandablebottombar.ExpandableBottomBar
 
 class NotificationBadgeActivity : AppCompatActivity() {
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/ProgrammaticallyCreatedDemoActivity.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/ProgrammaticallyCreatedDemoActivity.kt
@@ -1,4 +1,4 @@
-package github.com.st235.expandablebottombar.screens
+package github.com.st235.expandablebottombar.app.screens
 
 import android.graphics.Color
 import android.os.Bundle
@@ -7,7 +7,7 @@ import android.view.View
 import android.view.ViewAnimationUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.graphics.ColorUtils
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 import github.com.st235.expandablebottombar.ExpandableBottomBar
 import github.com.st235.expandablebottombar.MenuItemDescriptor
 
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/ScrollableCoordinatorLayoutActivity.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/ScrollableCoordinatorLayoutActivity.kt
@@ -1,4 +1,4 @@
-package github.com.st235.expandablebottombar.screens
+package github.com.st235.expandablebottombar.app.screens
 
 import android.graphics.BitmapFactory
 import android.os.Bundle
@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
 import com.squareup.picasso.Picasso
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 import java.util.concurrent.Executors
 
 class ScrollableCoordinatorLayoutActivity : AppCompatActivity() {
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/SquareImageView.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/SquareImageView.kt
@@ -1,4 +1,4 @@
-package github.com.st235.expandablebottombar.screens
+package github.com.st235.expandablebottombar.app.screens
 
 import android.content.Context
 import android.util.AttributeSet
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/StylesActivity.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/StylesActivity.kt
@@ -1,8 +1,8 @@
-package github.com.st235.expandablebottombar.screens
+package github.com.st235.expandablebottombar.app.screens
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 
 class StylesActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/XmlDeclaredActivity.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/XmlDeclaredActivity.kt
@@ -1,4 +1,4 @@
-package github.com.st235.expandablebottombar.screens
+package github.com.st235.expandablebottombar.app.screens
 
 import android.graphics.Color
 import android.os.Bundle
@@ -8,7 +8,7 @@ import android.view.ViewAnimationUtils
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.graphics.ColorUtils
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 import github.com.st235.expandablebottombar.ExpandableBottomBar
 
 class XmlDeclaredActivity : AppCompatActivity() {
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/navigation/FirstFragment.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/navigation/FirstFragment.kt
@@ -1,11 +1,11 @@
-package github.com.st235.expandablebottombar.screens.navigation
+package github.com.st235.expandablebottombar.app.screens.navigation
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 
 class FirstFragment: Fragment() {
 
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/navigation/NavigationComponentActivity.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/navigation/NavigationComponentActivity.kt
@@ -1,9 +1,9 @@
-package github.com.st235.expandablebottombar.screens.navigation
+package github.com.st235.expandablebottombar.app.screens.navigation
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.Navigation
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 import github.com.st235.expandablebottombar.ExpandableBottomBar
 import github.com.st235.expandablebottombar.navigation.ExpandableBottomBarNavigationUI
 
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/navigation/SecondFragment.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/navigation/SecondFragment.kt
@@ -1,11 +1,11 @@
-package github.com.st235.expandablebottombar.screens.navigation
+package github.com.st235.expandablebottombar.app.screens.navigation
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 
 class SecondFragment: Fragment() {
 
diff --git a/app/src/main/java/github/com/st235/expandablebottombar/app/screens/navigation/ThirdFragment.kt b/app/src/main/java/github/com/st235/expandablebottombar/app/screens/navigation/ThirdFragment.kt
@@ -1,11 +1,11 @@
-package github.com.st235.expandablebottombar.screens.navigation
+package github.com.st235.expandablebottombar.app.screens.navigation
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import github.com.st235.expandablebottombar.R
+import github.com.st235.expandablebottombar.app.R
 
 class ThirdFragment: Fragment() {
 
diff --git a/app/src/main/res/layout/activity_coordinator_layout.xml b/app/src/main/res/layout/activity_coordinator_layout.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="github.com.st235.expandablebottombar.screens.CoordinatorLayoutActivity">
+    tools:context=".screens.CoordinatorLayoutActivity">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
diff --git a/app/src/main/res/layout/activity_scrollable_coordinator_layout.xml b/app/src/main/res/layout/activity_scrollable_coordinator_layout.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="github.com.st235.expandablebottombar.screens.CoordinatorLayoutActivity">
+    tools:context=".screens.CoordinatorLayoutActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
diff --git a/app/src/main/res/layout/item_cat.xml b/app/src/main/res/layout/item_cat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<github.com.st235.expandablebottombar.screens.SquareImageView xmlns:android="http://schemas.android.com/apk/res/android"
+<github.com.st235.expandablebottombar.app.screens.SquareImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/item_iv"
     android:scaleType="centerCrop"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
@@ -6,19 +6,19 @@
 
     <fragment
         android:id="@+id/fragment1"
-        android:name="github.com.st235.expandablebottombar.screens.navigation.FirstFragment"
+        android:name="github.com.st235.expandablebottombar.app.screens.navigation.FirstFragment"
         android:label="Fragment 1"
         tools:layout="@layout/fragment_one" />
 
     <fragment
         android:id="@+id/fragment2"
-        android:name="github.com.st235.expandablebottombar.screens.navigation.SecondFragment"
+        android:name="github.com.st235.expandablebottombar.app.screens.navigation.SecondFragment"
         android:label="Fragment 2"
         tools:layout="@layout/fragment_two" />
 
     <fragment
         android:id="@+id/fragment3"
-        android:name="github.com.st235.expandablebottombar.screens.navigation.ThirdFragment"
+        android:name="github.com.st235.expandablebottombar.app.screens.navigation.ThirdFragment"
         android:label="Fragment 3"
         tools:layout="@layout/fragment_three" />
 
diff --git a/build.gradle b/build.gradle
@@ -5,11 +5,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
+        classpath 'com.android.tools.build:gradle:9.2.1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.21'
         classpath 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8'
         classpath 'com.dropbox.dependency-guard:dependency-guard:0.5.0'
-        classpath 'org.jetbrains.kotlinx:binary-compatibility-validator:0.18.1'
     }
 }
 
diff --git a/expandablebottombar/build.gradle b/expandablebottombar/build.gradle
@@ -1,18 +1,16 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'io.gitlab.arturbosch.detekt'
 apply plugin: 'com.dropbox.dependency-guard'
-apply plugin: 'org.jetbrains.kotlinx.binary-compatibility-validator'
 apply from: './maven.gradle'
 
 android {
     namespace 'github.com.st235.expandablebottombar'
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 34
-        compileSdk 34
+        targetSdkVersion 37
+        compileSdk 37
         versionCode project.property('VERSION_CODE') as int
         versionName project.property('VERSION_NAME')
 
@@ -41,9 +39,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     kotlin {
         jvmToolchain(17)
     }
@@ -54,18 +49,18 @@ dependencyGuard {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.10'
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.3'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'com.google.android.material:material:1.13.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.8'
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.3.1'
-    testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'org.mockito.kotlin:mockito-kotlin:5.1.0'
-    testImplementation 'org.robolectric:robolectric:4.8.1'
+    testImplementation 'org.mockito:mockito-core:5.23.0'
+    testImplementation 'org.hamcrest:hamcrest-library:3.0'
+    testImplementation 'androidx.test:core:1.7.0'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:6.3.0'
+    testImplementation 'org.robolectric:robolectric:4.16.1'
 
 }
diff --git a/expandablebottombar/dependencies/releaseRuntimeClasspath.txt b/expandablebottombar/dependencies/releaseRuntimeClasspath.txt
diff --git a/expandablebottombar/maven.gradle b/expandablebottombar/maven.gradle
diff --git a/expandablebottombar/src/main/AndroidManifest.xml b/expandablebottombar/src/main/AndroidManifest.xml
diff --git a/expandablebottombar/src/main/java/github/com/st235/expandablebottombar/behavior/ExpandableBottomBarBehavior.kt b/expandablebottombar/src/main/java/github/com/st235/expandablebottombar/behavior/ExpandableBottomBarBehavior.kt
diff --git a/expandablebottombar/src/main/java/github/com/st235/expandablebottombar/components/MenuItemView.kt b/expandablebottombar/src/main/java/github/com/st235/expandablebottombar/components/MenuItemView.kt
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package github.com.st235.expandablebottombar`
	`1`	`+package github.com.st235.expandablebottombar.app`
`2`	`2`
`3`	`3`	`import android.text.method.LinkMovementMethod`
`4`	`4`	`import android.view.LayoutInflater`