Skip to content

Commit

Permalink
Switch to single-project build
Browse files Browse the repository at this point in the history
  • Loading branch information
ldeso committed Apr 2, 2024
1 parent abd793f commit ed449c3
Show file tree
Hide file tree
Showing 28 changed files with 72 additions and 79 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/.idea
/app/build
/app/release
/build
/release
/captures
.cxx
.DS_Store
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#### Notes

- Switch to single-project build
- Add `currentTime` variable to decrease code repetitions
- Rename `CallbackCaller` to `CallbackHandler`
- Use correct default values in `ClockContentPreview`
Expand Down
26 changes: 12 additions & 14 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,25 @@ defaults:
permalink: /privacy-policy/

exclude:
- /app/src/main/res
- /app/src/main/AndroidManifest.xml
- /app/build.gradle.kts
- /gradle
- /metadata/en-US/changelogs
- /metadata/en-US/images/phoneScreenshots/3.png
- /metadata/en-US/images/phoneScreenshots/4.png
- /metadata/en-US/images/sevenInchScreenshots
- /metadata/en-US/images/tenInchScreenshots
- /metadata/en-US/images/featureGraphic.png
- /metadata/en-US/full_description.txt
- /metadata/en-US/short_description.txt
- /metadata/en-US/title.txt
- /metadata/fr-FR
- build.gradle.kts
- CNAME
- gradle
- gradle.properties
- gradlew
- gradlew.bat
- LICENSE
- metadata/en-US/changelogs
- metadata/en-US/images/phoneScreenshots/3.png
- metadata/en-US/images/phoneScreenshots/4.png
- metadata/en-US/images/sevenInchScreenshots
- metadata/en-US/images/tenInchScreenshots
- metadata/en-US/images/featureGraphic.png
- metadata/en-US/full_description.txt
- metadata/en-US/short_description.txt
- metadata/en-US/title.txt
- metadata/fr-FR
- settings.gradle.kts
- src

optional_front_matter:
remove_originals: true
Expand Down
60 changes: 0 additions & 60 deletions app/build.gradle.kts

This file was deleted.

60 changes: 58 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,60 @@
plugins {
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.jetbrainsKotlinAndroid) apply false
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid)
}

android {
namespace = "net.leodesouza.blitz"
compileSdk = 34

defaultConfig {
applicationId = "net.leodesouza.blitz"
minSdk = 21
targetSdk = 34
versionCode = 180
versionName = "1.8.0"

base {
archivesName = "${applicationId}_$versionCode"
}
}

buildTypes {
release {
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
}
}

buildFeatures {
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
}

androidResources {
generateLocaleConfig = true
}
}

dependencies {
val composeBom = platform(libs.androidx.compose.bom)
implementation(composeBom)
debugImplementation(composeBom)

implementation(libs.androidx.activity.compose)
implementation(libs.androidx.compose.foundation)
implementation(libs.androidx.lifecycle.runtime.compose)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.ui.tooling.preview)
debugImplementation(libs.androidx.ui.tooling)
}

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(libs.versions.jdk.get()))
}
}
1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ dependencyResolutionManagement {
}

rootProject.name = "Blitz"
include(":app")
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit ed449c3

Please sign in to comment.