Merge pull request #23 from bitfunk/feature/bump-dependencies

Bump dependencies

CHANGELOG.md

@@ -18,10 +18,24 @@ See [changeset](https://github.com/wmontwe/blueprint-mobile/compare/v0.1.0...mai
 
 ### Bumped
 
-- Koin 3.2.3 -> 3.3.0 and Koin Android 3.2.3 -> 3.3.1
-- Mockk 1.12.5 -> 1.13.3
-- Android Desugar 1.1.8 -> 1.2.2
-- Bitfunk Quality 0.1.1 -> 0.1.2
+- Gradle 7.5.1 -> 8.0.1
+- Android Gradle Plugin 7.3.1 -> 7.4.1
+- Bitfunk Quality 0.1.1 -> 0.2.0
+- Bitfunk Versioning 0.1.2 -> 0.2.0
+- Binary Compatibility Validator 0.12.1 -> 0.13.0
+- Kotlin 1.7.20 -> 1.8.0
+- Koin 3.2.3 -> 3.3.3
+- Koin Android 3.2.3 -> 3.3.3
+- Mockk 1.12.5 -> 1.13.4
+- Android Desugar 1.1.8 -> 2.0.2
+- Android Compose Compiler 1.3.2 -> 1.4.0
+- Android Compose 1.3.2 -> 1.3.3
+- SqlDelight 1.5.4 -> 1.5.5
+- AndroidX Test Runner 1.5.1 -> 1.5.2
+- AndroidX Test Junit 1.1.4 -> 1.1.5
+- Ktor 2.2.1 -> 2.2.3
+- Robolectric 4.9.1 -> 4.9.2
+- Compose Kakao 0.1.1 -> 0.2.2
 
 ## [0.1.0](https://github.com/wmontwe/blueprint-mobile/releases/tag/v0.1.0)
 

Dangerfile.df.kts

@@ -66,23 +66,23 @@ danger(args) {
  "\nrelease/1.2(.3)(/prepare-1.2.3)\n" +
  "\nfeature/(ISSUE-123)/add|change|remove|fix|bump|security-feature-title\n" +
  "\n\n" +
- "\n Current name: $branchName"
+ "\n Current name: $branchName",
  )
  }
 
  if (isFeatureBranch) {
  if (!isFeatureTitle) {
  fail(
  "Title is not following our pattern:\n" +
- "\n[issue_id](optional) Add|Change|Remove|Fix|Bump|Security {Feature title}"
+ "\n[issue_id](optional) Add|Change|Remove|Fix|Bump|Security {Feature title}",
  )
  }
  }
 
  if (isReleaseBranch) {
  if (!isReleaseTitle) {
  fail(
- "Title is not following our pattern: Prepare Release major.minor.patch (1.2.0)"
+ "Title is not following our pattern: Prepare Release major.minor.patch (1.2.0)",
  )
  }
  }

app-android/build.gradle.kts

@@ -27,7 +27,7 @@ android {
  isMinifyEnabled = false
  proguardFiles(
  getDefaultProguardFile("proguard-android-optimize.txt"),
- "proguard-rules.pro"
+ "proguard-rules.pro",
  )
  }
  }

app-android/src/androidTest/java/eu/bitfunk/blueprint/mobile/android/app/test/compose/ComposeTestContentTheme.kt

@@ -30,7 +30,7 @@ import eu.bitfunk.blueprint.mobile.android.app.ui.theme.BlueprintColors
 import eu.bitfunk.blueprint.mobile.android.app.ui.theme.BlueprintTheme
 
 fun ComposeContentTestRule.setThemedContent(
- content: @Composable () -> Unit
+ content: @Composable () -> Unit,
 ) {
  setContent {
  BlueprintTheme {
@@ -40,17 +40,17 @@ fun ComposeContentTestRule.setThemedContent(
 }
 
 fun ComposeContentTestRule.setThemedScreenshotContent(
- content: @Composable () -> Unit
+ content: @Composable () -> Unit,
 ) {
  setContent {
  BlueprintTheme {
  Surface(
- color = BlueprintColors.debug
+ color = BlueprintColors.debug,
  ) {
  Box(
  modifier = Modifier
  .height(800.dp)
- .width(480.dp)
+ .width(480.dp),
  ) {
  content()
  }

app-android/src/androidTest/java/eu/bitfunk/blueprint/mobile/android/app/test/compose/ComposeTestScreenshot.kt

@@ -39,7 +39,7 @@ import eu.bitfunk.blueprint.mobile.android.app.test.util.saveBitmapInDownloads
 fun SemanticsNodeInteraction.assertScreenshotMatches(
  folderPath: String,
  fileName: String,
- saveAsExpected: Boolean = true
+ saveAsExpected: Boolean = true,
 ) {
  val actualBitmap = captureToImage().asAndroidBitmap()
  val screenShotName = "$fileName-${actualBitmap.width}x${actualBitmap.height}.png"

app-android/src/androidTest/java/eu/bitfunk/blueprint/mobile/android/app/test/util/TestContentResolverSaver.kt

@@ -41,7 +41,7 @@ fun saveBitmapInDownloads(name: String, bitmap: Bitmap) {
 fun saveWithContentResolver(
  contentValues: ContentValues,
  contentUri: Uri,
- mapping: (OutputStream) -> Unit
+ mapping: (OutputStream) -> Unit,
 ) {
  val resolver = InstrumentationRegistry.getInstrumentation().targetContext.contentResolver
  val uri: Uri? = resolver.insert(contentUri, contentValues)

app-android/src/main/java/eu/bitfunk/blueprint/mobile/android/app/MainActivity.kt

@@ -38,7 +38,7 @@ class MainActivity : ComponentActivity() {
  // A surface container using the 'background' color from the theme
  Surface(
  modifier = Modifier.fillMaxSize(),
- color = MaterialTheme.colorScheme.background
+ color = MaterialTheme.colorScheme.background,
  ) {
  Greeting("Android")
  }

app-android/src/main/java/eu/bitfunk/blueprint/mobile/android/app/ui/theme/Theme.kt

@@ -36,20 +36,20 @@ import androidx.core.view.ViewCompat
 private val DarkColorScheme = darkColorScheme(
  primary = Purple80,
  secondary = PurpleGrey80,
- tertiary = Pink80
+ tertiary = Pink80,
 )
 
 private val LightColorScheme = lightColorScheme(
  primary = Purple40,
  secondary = PurpleGrey40,
- tertiary = Pink40
+ tertiary = Pink40,
 )
 
 @Composable
 fun BlueprintTheme(
  darkTheme: Boolean = isSystemInDarkTheme(),
  dynamicColor: Boolean = true,
- content: @Composable () -> Unit
+ content: @Composable () -> Unit,
 ) {
  val useDynamicColors = dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
  val colorScheme = when {
@@ -70,6 +70,6 @@ fun BlueprintTheme(
  MaterialTheme(
  colorScheme = colorScheme,
  typography = Typography,
- content = content
+ content = content,
  )
 }

app-android/src/main/java/eu/bitfunk/blueprint/mobile/android/app/ui/theme/Type.kt

@@ -31,20 +31,20 @@ val Typography = Typography(
  fontWeight = FontWeight.Normal,
  fontSize = 16.sp,
  lineHeight = 24.sp,
- letterSpacing = 0.5.sp
+ letterSpacing = 0.5.sp,
  ),
  titleLarge = TextStyle(
  fontFamily = FontFamily.Default,
  fontWeight = FontWeight.Normal,
  fontSize = 22.sp,
  lineHeight = 28.sp,
- letterSpacing = 0.sp
+ letterSpacing = 0.sp,
  ),
  labelSmall = TextStyle(
  fontFamily = FontFamily.Default,
  fontWeight = FontWeight.Medium,
  fontSize = 11.sp,
  lineHeight = 16.sp,
- letterSpacing = 0.5.sp
- )
+ letterSpacing = 0.5.sp,
+ ),
 )

app-android/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http:https://schemas.android.com/apk/res/android">
  <background android:drawable="@drawable/ic_launcher_background" />
  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+ <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

app-android/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http:https://schemas.android.com/apk/res/android">
  <background android:drawable="@drawable/ic_launcher_background" />
  <foreground android:drawable="@drawable/ic_launcher_foreground" />
+ <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

build.gradle.kts

@@ -15,19 +15,19 @@ plugins {
 }
 
 reportConfig {
- sonarProjectKey.set("bitfunk_blueprint-mobile")
- sonarOrganization.set("bitfunk")
- coverageReportSourceDirs.set(
- listOf(
- "$projectDir/build/reports/jacoco/testCodeCoverageReport"
- )
- )
+  sonarProjectKey.set("bitfunk_blueprint-mobile")
+  sonarOrganization.set("bitfunk")
+  coverageReportSourceDirs.set(
+  listOf(
+  "$projectDir/build/reports/jacoco/testCodeCoverageReport",
+  ),
+  )
 }
 
 project(":docs") {
- sonarqube {
- isSkipProject = true
- }
+  sonarqube {
+  isSkipProject = true
+  }
 }
 
 tasks.maybeCreate("clean", Delete::class.java).delete("build")

docs/build.gradle.kts

@@ -34,7 +34,7 @@ python {
  "mkdocs-same-dir:0.1.2",
  "mkdocs-exclude:1.0.2",
  "pygments:2.13.0",
- "pymdown-extensions:9.9"
+ "pymdown-extensions:9.9",
  )
 }
 

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-gradle = "7.5.1"
+gradle = "8.0.1"
 
 # Kotlin
-kotlin = "1.7.20"
+kotlin = "1.8.0"
 kotlinx-coroutines = "1.6.4"
 kotlinx-serialization = "1.4.1"
 kotlinx-datetime = "0.4.0"
@@ -15,43 +15,43 @@ minSdk = "21"
 targetSdk = "33"
 compileSdk = "33"
 
-android-gradlePlugin = "7.3.1"
-android-desugaring = "1.2.2"
+android-gradlePlugin = "7.4.1"
+android-desugaring = "2.0.2"
 
 androidx-core = "1.9.0"
 
-androidx-compose-compiler = "1.3.2"
-androidx-compose = "1.3.2"
+androidx-compose-compiler = "1.4.0"
+androidx-compose = "1.3.3"
 androidx-compose-foundation = "1.3.1"
 androidx-compose-material3 = "1.0.1"
 androidx-activity-compose = "1.6.1"
 androidx-navigation-compose = "2.5.3"
 androidx-lifecycle-viewmodel-compose = "2.5.1"
 
 # Libraries
-koin = "3.3.0"
-koin-android = "3.3.1"
-ktor = "2.2.1"
-sqldelight = "1.5.4"
+koin = "3.3.3"
+koin-android = "3.3.3"
+ktor = "2.2.3"
+sqldelight = "1.5.5"
 
 # Android Test
 test-jUnit = "4.13.2"
-test-mockk = "1.13.3"
-test-robolectric = "4.9.1"
+test-mockk = "1.13.4"
+test-robolectric = "4.9.2"
 test-turbine = "0.12.1"
 
 # Android AndroidTest
-androidx-test-runner = "1.5.1"
+androidx-test-runner = "1.5.2"
 androidx-test-rules = "1.5.0"
-androidx-test-junit = "1.1.4"
+androidx-test-junit = "1.1.5"
 androidx-test-espresso = "3.5.0"
-android-test-kakaoCompose = "0.1.1"
+android-test-kakaoCompose = "0.2.2"
 
 ## Gradle plugins
 plugin-version-update = "0.44.0"
-plugin-binary-compatibility-validator = "0.12.1"
-plugin-bitfunk-quality = "0.1.2"
-plugin-bitfunk-versioning = "0.1.2"
+plugin-binary-compatibility-validator = "0.13.0"
+plugin-bitfunk-quality = "0.2.0"
+plugin-bitfunk-versioning = "0.2.0"
 
 [libraries]
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.0.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 # Darwin, MinGW, and NonStop.
 #
 # (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 # within the Gradle project.
 #
 # You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
  esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
  case $MAX_FD in #(
  max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
  MAX_FD=$( ulimit -H -n ) ||
  warn "Could not query maximum file descriptor limit"
  esac
  case $MAX_FD in #(
  '' | soft) :;; #(
  *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
  ulimit -n "$MAX_FD" ||
  warn "Could not set maximum file descriptor limit to $MAX_FD"
  esac

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

settings.gradle.kts

@@ -23,5 +23,5 @@ include("docs")
 
 // App
 include(
- "app-android"
+ "app-android",
 )