Skip to content

Commit a5c42ef

Browse files
shinhyoshinhyo
authored
Merge pull request #13 from shinhyo/chore/kotlin2.0
chore/kotlin2.0
2 parents 69eda79 + 4c94de3 commit a5c42ef

File tree

20 files changed

+303
-190
lines changed

20 files changed

+303
-190
lines changed

‎.github/workflows/Build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build
33
on:
44
push:
55
branches:
6-
- main
6+
- develop
77
pull_request:
88

99
concurrency:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ build/
88
.externalNativeBuild
99
app/build
1010
build
11+
/.kotlin

‎.run/spotlessApply.run.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="spotlessApply" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="--init-script=gradle/init.gradle.kts" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="spotlessApply" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<method v="2" />
22+
</configuration>
23+
</component>

‎README.md‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<h1 align="center">Breaking Bad - Jetpack Compose</h1>
1+
<h1 align="center"> 🧪 Breaking Bad - Jetpack Compose</h1>
22

33
<p align="center">
44
<a href='https://developer.android.com'><img src='http://img.shields.io/badge/platform-android-green.svg'/></a>
5-
<a href="https://kotlinlang.org/docs/whatsnew1920.html"><img src = "https://shields.io/badge/kotlin-1.9.23-blue" /></a>
6-
<a href="https://developer.android.com/jetpack/compose/bom"><img src = "https://img.shields.io/badge/jetpack%20compose-2024.05.00-brightgreen" /></a>
5+
<a href="https://kotlinlang.org/docs/whatsnew1920.html"><img src = "https://shields.io/badge/kotlin-2.0.10-blue" /></a>
6+
<a href="https://developer.android.com/jetpack/compose/bom"><img src = "https://img.shields.io/badge/jetpack%20compose-2024.06.00-brightgreen" /></a>
77
<a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg"/></a>
88
</p>
99

@@ -36,7 +36,7 @@
3636
- [Coil-Compose](https://coil-kt.github.io/coil/compose)
3737
- [Timber](https://github.com/JakeWharton/timber)
3838
- [Haze](https://github.com/chrisbanes/haze)
39-
- [sharedElement](https://developer.android.com/guide/fragments/animate#shared)
39+
- [SharedElement](https://developer.android.com/guide/fragments/animate#shared)
4040

4141
## Multi Module
4242

@@ -60,22 +60,5 @@
6060
   └── setting
6161
```
6262

63+
## Module Graphs
6364
![](project.dot.png)
64-
65-
# License
66-
67-
```xml
68-
Designed and developed by 2021 shinhyo
69-
70-
Licensed under the Apache License, Version 2.0 (the "License");
71-
you may not use this file except in compliance with the License.
72-
You may obtain a copy of the License at
73-
74-
http://www.apache.org/licenses/LICENSE-2.0
75-
76-
Unless required by applicable law or agreed to in writing, software
77-
distributed under the License is distributed on an "AS IS" BASIS,
78-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
79-
See the License for the specific language governing permissions and
80-
limitations under the License.
81-
```

‎app/build.gradle.kts‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,3 @@
11
plugins {
22
id("brba.android.application")
33
}
4-
5-
android {
6-
namespace = "io.github.shinhyo.brba"
7-
8-
defaultConfig {
9-
applicationId = "io.github.shinhyo.brba"
10-
versionCode = 1
11-
versionName = "1.0"
12-
}
13-
14-
signingConfigs {
15-
getByName("debug") {
16-
storeFile = rootProject.file("debug.keystore")
17-
storePassword = "android"
18-
keyAlias = "androiddebugkey"
19-
keyPassword = "android"
20-
}
21-
}
22-
23-
buildTypes {
24-
getByName("debug") {
25-
isDebuggable = false
26-
}
27-
28-
getByName("release") {
29-
isDebuggable = false
30-
isShrinkResources = true
31-
isMinifyEnabled = true
32-
proguardFiles(
33-
getDefaultProguardFile("proguard-android-optimize.txt"),
34-
"proguard-rules.pro",
35-
)
36-
signingConfig = signingConfigs.getByName("debug")
37-
}
38-
}
39-
40-
buildFeatures {
41-
buildConfig = true
42-
}
43-
}
44-
45-
dependencies {
46-
implementation(project(":feature:main"))
47-
48-
implementation(libs.androidx.startup)
49-
implementation(libs.androidx.compose.material3)
50-
implementation(libs.timber)
51-
implementation(libs.coil.kt)
52-
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66

77
<application
88
android:name=".BrBaApplication"
9-
android:allowBackup="false"
9+
android:allowBackup="true"
10+
android:dataExtractionRules="@xml/data_extraction_rules"
1011
android:enableOnBackInvokedCallback="true"
12+
android:fullBackupContent="@xml/backup_rules"
1113
android:hardwareAccelerated="true"
1214
android:icon="@mipmap/ic_launcher"
1315
android:label="@string/app_name"

‎app/src/main/res/values/colors.xml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎app/src/main/res/xml/backup_rules.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?><!--
2+
Sample backup rules file; uncomment and customize as necessary.
3+
See https://developer.android.com/guide/topics/data/autobackup
4+
for details.
5+
Note: This file is ignored for devices older that API 31
6+
See https://developer.android.com/about/versions/12/backup-restore
7+
-->
8+
<full-backup-content>
9+
<!--
10+
<include domain="sharedpref" path="."/>
11+
<exclude domain="sharedpref" path="device.xml"/>
12+
-->
13+
</full-backup-content>

‎app/src/main/res/xml/data_extraction_rules.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?><!--
2+
Sample data extraction rules file; uncomment and customize as necessary.
3+
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
4+
for details.
5+
-->
6+
<data-extraction-rules>
7+
<cloud-backup>
8+
<!-- TODO: Use <include> and <exclude> to control what is backed up.
9+
<include .../>
10+
<exclude .../>
11+
-->
12+
</cloud-backup>
13+
<!--
14+
<device-transfer>
15+
<include .../>
16+
<exclude .../>
17+
</device-transfer>
18+
-->
19+
</data-extraction-rules>

‎build-logic/convention/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ tasks.withType<KotlinCompile>().configureEach {
2020
dependencies {
2121
compileOnly(libs.android.gradlePlugin)
2222
compileOnly(libs.android.tools.common)
23+
compileOnly(libs.compose.gradlePlugin)
2324
compileOnly(libs.kotlin.gradlePlugin)
2425
compileOnly(libs.ksp.gradlePlugin)
2526
}

0 commit comments

Comments
 (0)