Skip to content

Commit 9b1ac79

Browse files
authored
Merge pull request #23 from bitfunk/feature/bump-dependencies
Bump dependencies
2 parents f693ae6 + 66ca10b commit 9b1ac79

File tree

19 files changed

+80
-58
lines changed

19 files changed

+80
-58
lines changed

CHANGELOG.md

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,24 @@ See [changeset](https://github.com/wmontwe/blueprint-mobile/compare/v0.1.0...mai
1818

1919
### Bumped
2020

21-
- Koin 3.2.3 -> 3.3.0 and Koin Android 3.2.3 -> 3.3.1
22-
- Mockk 1.12.5 -> 1.13.3
23-
- Android Desugar 1.1.8 -> 1.2.2
24-
- Bitfunk Quality 0.1.1 -> 0.1.2
21+
- Gradle 7.5.1 -> 8.0.1
22+
- Android Gradle Plugin 7.3.1 -> 7.4.1
23+
- Bitfunk Quality 0.1.1 -> 0.2.0
24+
- Bitfunk Versioning 0.1.2 -> 0.2.0
25+
- Binary Compatibility Validator 0.12.1 -> 0.13.0
26+
- Kotlin 1.7.20 -> 1.8.0
27+
- Koin 3.2.3 -> 3.3.3
28+
- Koin Android 3.2.3 -> 3.3.3
29+
- Mockk 1.12.5 -> 1.13.4
30+
- Android Desugar 1.1.8 -> 2.0.2
31+
- Android Compose Compiler 1.3.2 -> 1.4.0
32+
- Android Compose 1.3.2 -> 1.3.3
33+
- SqlDelight 1.5.4 -> 1.5.5
34+
- AndroidX Test Runner 1.5.1 -> 1.5.2
35+
- AndroidX Test Junit 1.1.4 -> 1.1.5
36+
- Ktor 2.2.1 -> 2.2.3
37+
- Robolectric 4.9.1 -> 4.9.2
38+
- Compose Kakao 0.1.1 -> 0.2.2
2539

2640
## [0.1.0](https://github.com/wmontwe/blueprint-mobile/releases/tag/v0.1.0)
2741

Dangerfile.df.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,23 @@ danger(args) {
6666
"\nrelease/1.2(.3)(/prepare-1.2.3)\n" +
6767
"\nfeature/(ISSUE-123)/add|change|remove|fix|bump|security-feature-title\n" +
6868
"\n\n" +
69-
"\n Current name: $branchName"
69+
"\n Current name: $branchName",
7070
)
7171
}
7272

7373
if (isFeatureBranch) {
7474
if (!isFeatureTitle) {
7575
fail(
7676
"Title is not following our pattern:\n" +
77-
"\n[issue_id](optional) Add|Change|Remove|Fix|Bump|Security {Feature title}"
77+
"\n[issue_id](optional) Add|Change|Remove|Fix|Bump|Security {Feature title}",
7878
)
7979
}
8080
}
8181

8282
if (isReleaseBranch) {
8383
if (!isReleaseTitle) {
8484
fail(
85-
"Title is not following our pattern: Prepare Release major.minor.patch (1.2.0)"
85+
"Title is not following our pattern: Prepare Release major.minor.patch (1.2.0)",
8686
)
8787
}
8888
}

app-android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
isMinifyEnabled = false
2828
proguardFiles(
2929
getDefaultProguardFile("proguard-android-optimize.txt"),
30-
"proguard-rules.pro"
30+
"proguard-rules.pro",
3131
)
3232
}
3333
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import eu.bitfunk.blueprint.mobile.android.app.ui.theme.BlueprintColors
3030
import eu.bitfunk.blueprint.mobile.android.app.ui.theme.BlueprintTheme
3131

3232
fun ComposeContentTestRule.setThemedContent(
33-
content: @Composable () -> Unit
33+
content: @Composable () -> Unit,
3434
) {
3535
setContent {
3636
BlueprintTheme {
@@ -40,17 +40,17 @@ fun ComposeContentTestRule.setThemedContent(
4040
}
4141

4242
fun ComposeContentTestRule.setThemedScreenshotContent(
43-
content: @Composable () -> Unit
43+
content: @Composable () -> Unit,
4444
) {
4545
setContent {
4646
BlueprintTheme {
4747
Surface(
48-
color = BlueprintColors.debug
48+
color = BlueprintColors.debug,
4949
) {
5050
Box(
5151
modifier = Modifier
5252
.height(800.dp)
53-
.width(480.dp)
53+
.width(480.dp),
5454
) {
5555
content()
5656
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import eu.bitfunk.blueprint.mobile.android.app.test.util.saveBitmapInDownloads
3939
fun SemanticsNodeInteraction.assertScreenshotMatches(
4040
folderPath: String,
4141
fileName: String,
42-
saveAsExpected: Boolean = true
42+
saveAsExpected: Boolean = true,
4343
) {
4444
val actualBitmap = captureToImage().asAndroidBitmap()
4545
val screenShotName = "$fileName-${actualBitmap.width}x${actualBitmap.height}.png"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fun saveBitmapInDownloads(name: String, bitmap: Bitmap) {
4141
fun saveWithContentResolver(
4242
contentValues: ContentValues,
4343
contentUri: Uri,
44-
mapping: (OutputStream) -> Unit
44+
mapping: (OutputStream) -> Unit,
4545
) {
4646
val resolver = InstrumentationRegistry.getInstrumentation().targetContext.contentResolver
4747
val uri: Uri? = resolver.insert(contentUri, contentValues)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MainActivity : ComponentActivity() {
3838
// A surface container using the 'background' color from the theme
3939
Surface(
4040
modifier = Modifier.fillMaxSize(),
41-
color = MaterialTheme.colorScheme.background
41+
color = MaterialTheme.colorScheme.background,
4242
) {
4343
Greeting("Android")
4444
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ import androidx.core.view.ViewCompat
3636
private val DarkColorScheme = darkColorScheme(
3737
primary = Purple80,
3838
secondary = PurpleGrey80,
39-
tertiary = Pink80
39+
tertiary = Pink80,
4040
)
4141

4242
private val LightColorScheme = lightColorScheme(
4343
primary = Purple40,
4444
secondary = PurpleGrey40,
45-
tertiary = Pink40
45+
tertiary = Pink40,
4646
)
4747

4848
@Composable
4949
fun BlueprintTheme(
5050
darkTheme: Boolean = isSystemInDarkTheme(),
5151
dynamicColor: Boolean = true,
52-
content: @Composable () -> Unit
52+
content: @Composable () -> Unit,
5353
) {
5454
val useDynamicColors = dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
5555
val colorScheme = when {
@@ -70,6 +70,6 @@ fun BlueprintTheme(
7070
MaterialTheme(
7171
colorScheme = colorScheme,
7272
typography = Typography,
73-
content = content
73+
content = content,
7474
)
7575
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ val Typography = Typography(
3131
fontWeight = FontWeight.Normal,
3232
fontSize = 16.sp,
3333
lineHeight = 24.sp,
34-
letterSpacing = 0.5.sp
34+
letterSpacing = 0.5.sp,
3535
),
3636
titleLarge = TextStyle(
3737
fontFamily = FontFamily.Default,
3838
fontWeight = FontWeight.Normal,
3939
fontSize = 22.sp,
4040
lineHeight = 28.sp,
41-
letterSpacing = 0.sp
41+
letterSpacing = 0.sp,
4242
),
4343
labelSmall = TextStyle(
4444
fontFamily = FontFamily.Default,
4545
fontWeight = FontWeight.Medium,
4646
fontSize = 11.sp,
4747
lineHeight = 16.sp,
48-
letterSpacing = 0.5.sp
49-
)
48+
letterSpacing = 0.5.sp,
49+
),
5050
)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
33
<background android:drawable="@drawable/ic_launcher_background" />
44
<foreground android:drawable="@drawable/ic_launcher_foreground" />
5+
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
56
</adaptive-icon>

0 commit comments

Comments
 (0)