From 31040aabc72d35647b5370608c9740195768cf21 Mon Sep 17 00:00:00 2001 From: Seamus Lowry Date: Sun, 8 Sep 2024 11:58:32 -0400 Subject: [PATCH 1/6] dependabot schedule --- .github/dependabot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 268a53d..11c6860 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,6 +13,9 @@ updates: directory: "/" schedule: interval: "weekly" + day: "saturday" + time: "03:00" + timezone: "America/New_York" groups: gradle-plugin-dependencies: patterns: From c440a3cb8cb7d3d46e756c3350ff8f99b0f0fdcd Mon Sep 17 00:00:00 2001 From: Seamus Lowry Date: Sun, 8 Sep 2024 13:12:23 -0400 Subject: [PATCH 2/6] add print versioncode --- app/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 8afc993..05a76b9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,4 +98,10 @@ tasks.register('printVersionName') { doLast { println android.defaultConfig.versionName } +} + +tasks.register('printVersionCode') { + doLast { + println android.defaultConfig.versionCode + } } \ No newline at end of file From f3af18b437aadb10af9cb310e907d7e869d41247 Mon Sep 17 00:00:00 2001 From: Seamus Lowry Date: Sun, 8 Sep 2024 13:58:40 -0400 Subject: [PATCH 3/6] feat/auto increment (#81) * dependabot * try determining * token * fix * fix sed? * fix yaml * chore: try get code * echo * quotes * try * lets see * -i * depndeabot patch * test * fix * commit * allow write * head ref * Automated changes * try * remove file * revert * staging branch instead * no need --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/dependabot.yml | 21 ++++++++++++++++++++- app/build.gradle | 6 ------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 11c6860..3d46e6c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,10 +5,20 @@ version: 2 updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + day: "saturday" + time: "03:00" + timezone: "America/New_York" - package-ecosystem: "bundler" # See documentation for possible values directory: "/" # Location of package manifests schedule: interval: "weekly" + day: "saturday" + time: "03:00" + timezone: "America/New_York" - package-ecosystem: "gradle" directory: "/" schedule: @@ -16,8 +26,17 @@ updates: day: "saturday" time: "03:00" timezone: "America/New_York" + target-branch: "staging/dependabot" groups: gradle-plugin-dependencies: patterns: - "com.android.application" - - "com.android.library" \ No newline at end of file + - "com.android.library" + kotlin-dependencies: + patterns: + - "org.jetbrains.kotlin.android" + - "org.jetbrains.kotlin.plugin.compose" + - "com.google.devtools.ksp" + hilt-dependencies: + patterns: + - "*hilt*" \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 05a76b9..8afc993 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,10 +98,4 @@ tasks.register('printVersionName') { doLast { println android.defaultConfig.versionName } -} - -tasks.register('printVersionCode') { - doLast { - println android.defaultConfig.versionCode - } } \ No newline at end of file From 77a4700cd883aedd1a424de1bdac7a63be56c7dc Mon Sep 17 00:00:00 2001 From: Seamus Lowry Date: Sun, 8 Sep 2024 14:07:49 -0400 Subject: [PATCH 4/6] room --- .github/dependabot.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3d46e6c..92f95d9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -39,4 +39,7 @@ updates: - "com.google.devtools.ksp" hilt-dependencies: patterns: - - "*hilt*" \ No newline at end of file + - "*hilt*" + room-dependencies: + patterns: + - "*room*" \ No newline at end of file From 839b2cea9a29a7a2c30545486ccd6cd1c1e932d8 Mon Sep 17 00:00:00 2001 From: Seamus Lowry Date: Sun, 8 Sep 2024 14:09:35 -0400 Subject: [PATCH 5/6] just do all together --- .github/dependabot.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 92f95d9..411c6ad 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,20 +26,7 @@ updates: day: "saturday" time: "03:00" timezone: "America/New_York" - target-branch: "staging/dependabot" groups: - gradle-plugin-dependencies: + all-dependencies: patterns: - - "com.android.application" - - "com.android.library" - kotlin-dependencies: - patterns: - - "org.jetbrains.kotlin.android" - - "org.jetbrains.kotlin.plugin.compose" - - "com.google.devtools.ksp" - hilt-dependencies: - patterns: - - "*hilt*" - room-dependencies: - patterns: - - "*room*" \ No newline at end of file + - "*" \ No newline at end of file From b65c69429884299385b939bd9d17c31d3d8379a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 18:27:47 +0000 Subject: [PATCH 6/6] chore(deps): bump the all-dependencies group with 4 updates (#82) * chore(deps): bump the all-dependencies group with 4 updates Bumps the all-dependencies group with 4 updates: [com.google.devtools.ksp](https://github.com/google/ksp), androidx.compose:compose-bom, androidx.lifecycle:lifecycle-runtime-ktx and androidx.activity:activity-compose. Updates `com.google.devtools.ksp` from 2.0.20-1.0.24 to 2.0.20-1.0.25 - [Release notes](https://github.com/google/ksp/releases) - [Commits](https://github.com/google/ksp/compare/2.0.20-1.0.24...2.0.20-1.0.25) Updates `androidx.compose:compose-bom` from 2024.08.00 to 2024.09.00 Updates `androidx.lifecycle:lifecycle-runtime-ktx` from 2.8.4 to 2.8.5 Updates `androidx.activity:activity-compose` from 1.9.1 to 1.9.2 --- updated-dependencies: - dependency-name: com.google.devtools.ksp dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: androidx.compose:compose-bom dependency-type: direct:production dependency-group: all-dependencies - dependency-name: androidx.lifecycle:lifecycle-runtime-ktx dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: androidx.activity:activity-compose dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies ... Signed-off-by: dependabot[bot] * version bump and color fixes * remove TODO --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Seamus Lowry --- app/build.gradle | 8 ++++---- .../daytracker/ui/screens/entry/EntryScreen.kt | 4 ++-- build.gradle | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8afc993..15a6a03 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { applicationId "seamuslowry.daytracker" minSdk 33 targetSdk 34 - versionCode 36 - versionName "0.30.1" + versionCode 37 + versionName "0.30.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary true @@ -70,8 +70,8 @@ dependencies { implementation 'androidx.compose.material:material-icons-extended' implementation "androidx.compose.material3:material3" implementation 'androidx.core:core-ktx:1.13.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.4' - implementation 'androidx.activity:activity-compose:1.9.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.5' + implementation 'androidx.activity:activity-compose:1.9.2' implementation "com.google.dagger:hilt-android:$hilt_version" implementation "androidx.hilt:hilt-navigation-compose:1.2.0" implementation "androidx.room:room-runtime:$room_version" diff --git a/app/src/main/java/seamuslowry/daytracker/ui/screens/entry/EntryScreen.kt b/app/src/main/java/seamuslowry/daytracker/ui/screens/entry/EntryScreen.kt index 8f1ff5f..a3644fa 100644 --- a/app/src/main/java/seamuslowry/daytracker/ui/screens/entry/EntryScreen.kt +++ b/app/src/main/java/seamuslowry/daytracker/ui/screens/entry/EntryScreen.kt @@ -147,7 +147,7 @@ fun ItemEntry( .placeholder( visible = itemWithConfiguration == null, highlight = PlaceholderHighlight.fade(), - color = MaterialTheme.colorScheme.surfaceVariant, + color = CardDefaults.cardColors().containerColor, ) .animateContentSize(), ) { @@ -276,7 +276,7 @@ fun AddConfigurationButton( val mainDuration = 500 val extraDuration = 100 val cardColor by animateColorAsState( - targetValue = if (itemConfiguration != null) MaterialTheme.colorScheme.surfaceVariant else MaterialTheme.colorScheme.primary, + targetValue = if (itemConfiguration != null) CardDefaults.cardColors().containerColor else MaterialTheme.colorScheme.primary, animationSpec = tween(durationMillis = mainDuration), label = "cardColor", ) diff --git a/build.gradle b/build.gradle index cdb7d08..c29dc16 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - compose_bom_version = '2024.08.00' + compose_bom_version = '2024.09.00' hilt_version = '2.52' room_version = '2.6.1' } @@ -12,5 +12,5 @@ plugins { id 'org.jetbrains.kotlin.plugin.compose' version '2.0.20' apply false id "com.diffplug.spotless" version "6.25.0" apply false id 'com.google.dagger.hilt.android' version '2.52' apply false - id 'com.google.devtools.ksp' version "2.0.20-1.0.24" apply false + id 'com.google.devtools.ksp' version "2.0.20-1.0.25" apply false } \ No newline at end of file