Skip to content

Commit 9e61730

Browse files
authored
Merge pull request #82 from bitfunk/feature/change-to-bitfunk-plugins
Change to bitfunk Gradle plugins
2 parents 9fe2185 + 6967fa2 commit 9e61730

File tree

43 files changed

+400
-819
lines changed

Some content is hidden

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

43 files changed

+400
-819
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@ about: Create a report to help us improve
2626

2727
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
2828
<!--- reproduce this bug. Include code to reproduce, if relevant -->
29-
1.
30-
2.
31-
3.
32-
4.
29+
30+
1. step
31+
2. step
32+
3. step
3333

3434
## 📷 Screenshots
35+
3536
<!-- If applicable, add screenshots to help explain your problem. -->
3637

3738
## 📱 Your Environment
3839

3940
<!--- Include as many relevant details about the environment you experienced the bug in -->
4041

41-
* Library/App Version used: <!-- e.g. 1.0.0 -->
42-
* Operating System and version (desktop or mobile): <!-- e.g. Android 12 -->
43-
* Device: <!-- e.g. Nexus 5 -->
42+
- Library/App Version used: <!-- e.g. 1.0.0 -->
43+
- Operating System and version (desktop or mobile): <!-- e.g. Android 12 -->
44+
- Device: <!-- e.g. Nexus 5 -->

.github/workflows/ci-pull-request-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI - Pull Request Validation
22

33
on:
44
pull_request:
5-
types: [ opened, synchronize, edited, reopened ]
5+
types: [ opened, synchronize, reopened ]
66
branches:
77
- main
88
- release/*

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ See [changeset](https://github.com/wmontwe/blueprint-mobile-kmp/compare/v1.0.0..
1717
- Documentation
1818
- MkDocs for generating project webpage
1919
- RenovateBot fo dependency updates
20+
- bitfunk versioning plugin to replace local project version plugin
21+
- bitfunk quality plugin to replace local detekt and spotless plugins
2022

2123
### Changed
2224

@@ -63,6 +65,7 @@ See [changeset](https://github.com/wmontwe/blueprint-mobile-kmp/compare/v1.0.0..
6365
- Robolectric 4.5.1 -> 4.9
6466
- Coil Compose 1.3.2 -> 2.2.2
6567
- Android Desugar 1.0.9 -> 1.2.2
68+
- Bitfunk Versioning 0.1.1 -> 0.1.2
6669

6770
### Deprecated
6871

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ Please refer to the [ISC License][license] for more information.
124124

125125
## Acknowledgements
126126

127-
* [Best README Template](https://github.com/othneildrew/Best-README-Template)
128-
* [Issue and Pull Request Template](https://www.talater.com/open-source-templates/#/)
129-
* [Reaktive - Project configuration with Gradle Plugins](https://github.com/badoo/Reaktive)
130-
* [Jetpack Compose Theme by Jetsnack](https://github.com/android/compose-samples/tree/main/Jetsnack)
127+
- [Best README Template](https://github.com/othneildrew/Best-README-Template)
128+
- [Issue and Pull Request Template](https://www.talater.com/open-source-templates/#/)
129+
- [Reaktive - Project configuration with Gradle Plugins](https://github.com/badoo/Reaktive)
130+
- [Jetpack Compose Theme by Jetsnack](https://github.com/android/compose-samples/tree/main/Jetsnack)
131131

132132
<!--readme-end-->

TEMPLATE_CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ See [changeset](PROJECT_GITHUB_LINK/compare/v0.0.1...main)
4545

4646
- for explanation how to migrate when BREAKING changes got introduced
4747

48-
4948
## [0.1.0](PROJECT_GITHUB_LINK//releases/tag/v0.1.0)
5049

5150
Example release

TEMPLATE_README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ PROJECT_DESCRIPTION
4444

4545
This is a blank template to get started. First replace following placeholders:
4646

47-
* PROJECT_TITLE
48-
* PROJECT_DESCRIPTION
49-
* PROJECT_GITHUB_LINK
50-
* PROJECT_WEBPAGE_URL
51-
* PROJECT_SONARCLOUD_NAME
47+
- PROJECT_TITLE
48+
- PROJECT_DESCRIPTION
49+
- PROJECT_GITHUB_LINK
50+
- PROJECT_WEBPAGE_URL
51+
- PROJECT_SONARCLOUD_NAME
5252

5353
Assets could be placed under `docs/src/assets/` folder and images should be placed in `docs/src/assets/images/`.
5454

app-android/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* PERFORMANCE OF THIS SOFTWARE.
1717
*/
1818

19-
import eu.upwolf.gradle.blueprint.version.version
20-
import eu.upwolf.gradle.blueprint.version.versionCode
19+
import eu.bitfunk.gradle.plugin.tool.versioning.version
20+
import eu.bitfunk.gradle.plugin.tool.versioning.versionCode
2121

2222
@Suppress("DSL_SCOPE_VIOLATION")
2323
plugins {

app-android/src/main/kotlin/eu/upwolf/mobile/blueprint/android/ui/reuse/AppScaffold.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import com.google.accompanist.insets.rememberInsetsPaddingValues
3131
import com.google.accompanist.insets.ui.TopAppBar
3232
import eu.upwolf.mobile.blueprint.android.R
3333
import eu.upwolf.mobile.blueprint.common.ui.theme.AppTheme
34-
import eu.upwolf.mobile.blueprint.common.ui.theme.AppThemeDimension
3534

3635
@OptIn(ExperimentalMaterial3Api::class)
3736
@Composable
@@ -61,12 +60,12 @@ fun AppScaffold(
6160

6261
@Preview(
6362
name = "Light preview",
64-
showBackground = true,
63+
showBackground = true
6564
)
6665
@Preview(
6766
name = "Dark preview",
6867
showBackground = true,
69-
uiMode = Configuration.UI_MODE_NIGHT_YES,
68+
uiMode = Configuration.UI_MODE_NIGHT_YES
7069
)
7170
@Composable
7271
fun DefaultPreview() {

app-desktop/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* PERFORMANCE OF THIS SOFTWARE.
1717
*/
1818

19-
import eu.upwolf.gradle.blueprint.version.versionCleaned
19+
import eu.bitfunk.gradle.plugin.tool.versioning.versionCleaned
2020
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
2121

2222
@Suppress("DSL_SCOPE_VIOLATION")

app-desktop/src/desktopMain/kotlin/eu/upwolf/mobile/blueprint/desktop/ui/MainApp.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,7 @@
1919
package eu.upwolf.mobile.blueprint.desktop.ui
2020

2121
import androidx.compose.desktop.ui.tooling.preview.Preview
22-
import androidx.compose.foundation.layout.Column
23-
import androidx.compose.foundation.layout.Spacer
24-
import androidx.compose.foundation.layout.fillMaxSize
25-
import androidx.compose.foundation.layout.height
26-
import androidx.compose.foundation.layout.padding
2722
import androidx.compose.runtime.Composable
28-
import androidx.compose.runtime.mutableStateOf
29-
import androidx.compose.runtime.remember
30-
import androidx.compose.ui.Alignment
31-
import androidx.compose.ui.Modifier
32-
import eu.upwolf.mobile.blueprint.common.ui.system.AppSurface
33-
import eu.upwolf.mobile.blueprint.common.ui.system.HeadlineLarge
34-
import eu.upwolf.mobile.blueprint.common.ui.system.ThemeOverview
35-
import eu.upwolf.mobile.blueprint.common.ui.system.ThemeSwitch
36-
import eu.upwolf.mobile.blueprint.common.ui.theme.AppTheme
37-
import eu.upwolf.mobile.blueprint.common.ui.theme.AppThemeMain
3823

3924
@Preview
4025
@Composable

0 commit comments

Comments
 (0)