Skip to content

Commit

Permalink
The K2 Migration (feat. The Compose Compiler Gradle Plugin) (#286)
Browse files Browse the repository at this point in the history
* Refactor: Change Package (#107)

* Refactor: Change Package

* fix failing tests.

* Refactor: Update event banner

* Feature: update launcher icon

* Migrate state in speakers screen and speakerdetails screen to viewmodel

* Update tests

* Requested changes

* fix label capitalization: changed 'advanced' to 'Advanced'

* extract hardcoded text to string resource

* contrib-readme-action has updated readme (#113)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#114)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#115)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#116)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update README.md

Updated event's date.

* contrib-readme-action has updated readme

* chore: updates ktlint to version 11.3.2

* Fixed crash on Filter Button under Sessions tab

* Removed redundant String declarations that caused ./codeanalysis.sh to fail

* contrib-readme-action has updated readme

* Feature: Add visibility flags for speakers and sessions.

* Refactor: clean up code.

* Create droidcon_logo_dark.xml

* check mode in code

* Added codeAnalysis.bat for windows uers and ran it

* set it for all AppBars'

* use if with id

* contrib-readme-action has updated readme (#127)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update to AS Flamingo (#126)

* updates

* Update AS Version

* Dependencies updates

* update readme

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* rename

* update java version on CI

* contrib-readme-action has updated readme (#130)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#131)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#132)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Migrate some State and viewModel calls from their composables to their respective ViewModels

* contrib-readme-action has updated readme

* contrib-readme-action has updated readme (#134)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feature: Enhance lint.

* Ft feedback emojis (#142)

* Replace feedback text to match design

* Add smilling face emoji

* Add neutral face emoji

* Add neutral face emoji

* Import bad-face feedback emoji

* Import bad-face feedback emoji

* Add neutral face emoji

* Fixes #136; Rename smiling face emoji

* Add feedback strings resource

* Closes #136; Check strings resource directory

* Closes #136; Add strings from string resource file

* contrib-readme-action has updated readme (#143)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feed api implementation (#125)

* Adding Feed.kt file

* Adding FeedRepo.kt Interface file

* Renaming Feed.kt to FeedDTO.kt

* Adding Feed ViewModel

* Adds feed implementation

* Changing API BaseURL Test

* Adding tests in FeedScreenTest.kt file

* Renamed api -> FeedApi

* Changed ResourceResult<List<Feed>> -> List<Feed>

* Referencing String directly from the composable

* Modifying FeedScreenTest.kt file

* Create droidcon_logo_dark.xml

* check mode in code

* Added codeAnalysis.bat for windows uers and ran it

* set it for all AppBars'

* use if with id

* contrib-readme-action has updated readme (#127)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update to AS Flamingo (#126)

* updates

* Update AS Version

* Dependencies updates

* update readme

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* rename

* update java version on CI

* contrib-readme-action has updated readme (#130)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#131)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#132)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Migrate some State and viewModel calls from their composables to their respective ViewModels

* contrib-readme-action has updated readme

* contrib-readme-action has updated readme (#134)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Adds feed implementation

* Handling state in the FeedScreen.kt file

* Refactoring results

* Fixes failing tests

* Fixes String resource merge conflicts

---------

Co-authored-by: brian.orwe <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harun Wangereka <[email protected]>
Co-authored-by: yveskalume <[email protected]>

* contrib-readme-action has updated readme (#144)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* WIP: Room dependency migration to convention plugin

* Fix: Room dependency migration to convention plugin

* contrib-readme-action has updated readme

* 34 create hilt convention plugin (#147)

* WIP: Hilt dependency migration to convention plugin

* WIP: Hilt migration updates

* Fix: Hilt migration updates

* Fix: Complete hilt migration updates

* Fix: Remove kapt for hilt convention plug in migration and other general cleanup

* contrib-readme-action has updated readme (#149)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feat: Migrate all compose dependencies to convention plugin

* Fix: Resolved error in test files after migrate of all compose dependencies to convention plugin

* Fix: Resolved error in test files after migrate of all compose dependencies to convention plugin

* Fix: Removing unused dependency

* contrib-readme-action has updated readme (#151)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix colors

* Ran codeAnalysis

* Use MaterialTheme on About navigator

* contrib-readme-action has updated readme (#154)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove ktlint and detekt plugins in modules

* 36 create firebase convention plugin (#155)

* WIP: Migrating Firebase dependencies to convention plugin

* WIP: Migrating Firebase dependencies to convention plugin

* WIP: Migrating Firebase dependencies to convention plugin

* fixed firebase plugin issue

* lint checks

* Feat: Migrated Firebase dependencies to convention plugin

---------

Co-authored-by: Juma Allan <[email protected]>

* contrib-readme-action has updated readme (#156)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feat: Migrated Kotlin Application dependencies to convention plugin

* Offline first capabilities (#158)

* Migrate state in speakers screen and speakerdetails screen to viewmodel

* Update tests

* Requested changes

* Offline first capabilities

* Fix linting errors

* Fix failing tests

* Made requested changes

* Made more requested change

* Fix errors

* Feature: Code cleanup

* Feature: Code cleanup

* Fix: failing CI

* Fix: failing CI

* Fix: failing CI

* Fix: failing CI

* Fix: failing CI

* Sessions offline first capabilities and app sync at startup time (#160)

* Migrate state in speakers screen and speakerdetails screen to viewmodel

* Update tests

* Requested changes

* Sessions offline first features

* Fix linting errors

* Fix failing tests

* Made requested changes

* Fix error due to merge conflict

* Removed comments and fixed failing test

* contrib-readme-action has updated readme (#163)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Dependencies Updates & AS Version Update (#165)

* updated AS version

* update deps

* few fixes

* few fixes

* few ui fixes

* update to use compose bom

* linting

* update chai target & compile sdk

* update all target & compile sdks

* fix failing tests

* contrib-readme-action has updated readme (#167)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Organizers offline first caching and some minor refactors (#164)

* Migrate state in speakers screen and speakerdetails screen to viewmodel

* Update tests

* Requested changes

* Organizers offline first and minor refactors

* Remove commented code

* updates name from Null to Rachel Murabula (#168)

Co-authored-by: Harun Wangereka <[email protected]>

* contrib-readme-action has updated readme (#169)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harun Wangereka <[email protected]>

* Feature: Add local datasource

* Feature: Add remote datasource

* Feature: Add interdependency

* Fix Feed Endpoint (#171)

* fix feed endpoint

* fix failing tests

* contrib-readme-action has updated readme (#174)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#175)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#176)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update README.md (#179)

* Animated shimmer effect

* Session Loading Card

* Session loading state

* Add loading box

* Add feed loading component

* Add loading state on feed screen

* Add loading state on HomeScreen sessions section

* Add loading state on HomeScreen speakers section

* Change session screen loading component

* Code cleanup

* contrib-readme-action has updated readme (#180)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feed offline first (#177)

      * Migrate state in speakers screen and speakerdetails screen to viewmodel

* Update tests

* Requested changes

* Organizers offline first and minor refactors

* Remove commented code

* Offline first feed

* Offline first feed

* contrib-readme-action has updated readme (#181)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Refactor: Move logic to data source

* Refactor: Move logic to data source

* Fix: Enhance Lint

* Cleaned up app module gradle files

* Cleaned up chai module gradle file

* Added all Ktor libraries to bundle

* Cleaned up presentation module gradle file

* Cleaned up datasourse:remote module gradle file

* Cleaned up chai module gradle file

* Updated the hiltConventionPlugin with common and work libraries

* Cleaned up espresso libraries

* Moved LibraryBuildFeatures to AndroidLibraryConventionPlugin

* Moved testOptions to AndroidLibraryConventionPlugin

* contrib-readme-action has updated readme

* setup common debug key for all users

* contrib-readme-action has updated readme (#188)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Refactor: Move logic to local datasource

* [Fix] Preview HomeScreen

* [Fix] Preview SpeakersScreen & SpeakerDetailsScreen

* [Fix] Preview SessionsScreen

* [Fix] Preview SessionDetailsScreen

* [Fix] Preview FeedBackScreen

* [Fix] Preview FeedScreen

* [Fix] Preview AboutScreen

* Fix codestyle

* Update tests to use screen routes

* Update README.md

* contrib-readme-action has updated readme (#189)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix navigation to speaker detail screen crash

* fixes #191

* update navigateToSpeaker function

* contrib-readme-action has updated readme

* Feature: Minify release.

* Closes #199 Fixing Dark Mode on Feed Screen

* Closes #199 Fixing Dark Mode on Feed Screen(remove Comments)

* color changes upon changing theme

* use color from chaicolors

* remove import

* contrib-readme-action has updated readme

* fix border color

* contrib-readme-action has updated readme

* fixing organizing team spacing

* Closes #194

* contrib-readme-action has updated readme

* contrib-readme-action has updated readme

* contrib-readme-action has updated readme

* Refactor: Cleanup home section

* Fix: failing tests

* contrib-readme-action has updated readme

* Feature: Add chai preview component.

* Fix: Failing tests.

* Fix: Clicking on a session on home screen navigates to session details.

* contrib-readme-action has updated readme

* Update about page content in the string file

* Updating About page Content

* contrib-readme-action has updated readme (#218)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix: Session Card On homepage not showing image.

* Add convention plugins to version catalog (#223)

* Add convention plugins to version catalogs

* Upgrade gradle to 8.4

From gradle 8.1+ plugin alias declarations are no longer highlighted as
an error.

* contrib-readme-action has updated readme (#220)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harun Wangereka <[email protected]>

* contrib-readme-action has updated readme (#226)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harun Wangereka <[email protected]>

* Validate the gradle wrapper during a PR

* contrib-readme-action has updated readme (#227)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Changing the home_header_welcome_label in strings.xml (#229)

* Update about page content in the string file

* Updating About page Content

* Changing the home_header_welcome_label in strings.xml

* contrib-readme-action has updated readme (#230)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* change

* changes Project level and data gradle to match convention

* changes version catalog

* contrib-readme-action has updated readme

* update hilt to v2.48

* Refactor dependencies in Project level gradle file to match convention

* replace instances of kapt with ksp

* contrib-readme-action has updated readme

* Fix: Failing detekt

* Readme Refactor
Refactor the deeplink for the designs links that were not nested properly in markdown

* Readme Refactor
Refactor the deeplink for the designs links that were not nested properly in markdown

* contrib-readme-action has updated readme

* Refactor: Sessions Screen Refactor

* Fix: Failing tests

* Make the press reaction more visible

* Fix bottom bar text, highlight when selected

* Almost forgot about the padding

* Fix: Cannot create Work-Manager

* contrib-readme-action has updated readme

* Fix: Event Date selector to match theme

* changed navigation to speaker details argument from id to name

* update speaker details test

* contrib-readme-action has updated readme

* Fix: Event Date selector switch

* Clean up libs.versions.toml

* contrib-readme-action has updated readme

* Refactor: Remove Gson from presentation layer.

* fix: Fix missing data on first run

* contrib-readme-action has updated readme

* Feature/designsystem (#249)

* Added Chai Title texts

* Added Chai Extra small body texts

* Added Chai small body texts

* Added Chai medium body texts

* Added Chai large body texts

* Added Chai buttons texts

* Added Chai label texts

* Updated the color design tokens

* Added more Chai DS color tokens

* Updated the bottom navigation bar to match the designs

* Updated the homeScreen text and color tokens

* Updated the FeedComponent to match the designs with the text and color tokens

* Updated the FeedShareSection with Design system texts and colors

* Updated the FeedScreen with the Design System texts and colors

* Updated the app's statusBarColor and content color

* Updated the SessionsCard with Chai texts and colors

* Added the sessions page title

* Updated the session screen loading and error components with Chai atoms

* Updated the FeedLoading component colors

* Updated the EventDaySelector Button texts

* Updated the CustomSwitch to match the designs with chai colors and text

* Added the SessionsCardWithBanner component for the agenda layout of the sessions screen

* Updated the about screen with chai texts and colors

* Updated the Speaker component with Chai atoms

* Updated the speaker screen with chai atoms

* Updated the speaker details screen with Chai texts and colors

* Updated the session details screen to match the designs

* Updated the feedbackscreen to match the design colors and text tokens

* Updated the filter bottom sheet view position

* Updated the SessionsFilterPanel with Chai color and text tokens

* Updated the Share modal background color

* Updated the AuthDialog with Chai color and text tokens

* Updated the OrganizedBySection with Chai tokens

* Cleaned up the usage of the DroidconKE2023 Theme in the components

* Cleaned up the usage of the DroidconKE2023 Theme in the tests

* Updated the Feedback screen to pass tests

* Removed the Theme package in the presentation module

* Cleaned up the ChaiDCKE22Theme: removed unused color scheme

* Updated all screens background

* Updated the droidcon Appbars with Chai tokens to match the designs

* Solved merge conflicts

* Fix: Duplicate organizers.

* refactor: Improve logic for filtering

* fix: Make filter bottom sheet scrollable

* contrib-readme-action has updated readme

* Feature: Push notifications.

* Fix: Failing CI

* Fix: Failing CI

* Fix: Failing CI

* Feature: Add function to delete channel

* Fix: Resolve PR comments.

* Fix: sponsor display

* Fix: sponsor display

* Fix: sponsor display

* Fix: Failing test

* Feature: make versions dynamic

* Fix: Workflow

* Fix: Workflow

* Fix: production bug

* format feed time

* Update date formatting function

* Update date formatting function

* run codeAnalysis

* contrib-readme-action has updated readme

* refactor: Improve logic for filtering

* refactor: Hide CFP banner

* contrib-readme-action has updated readme (#268)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: Fix broken organizer images

* contrib-readme-action has updated readme

* refactor: Minor UI improvements

* fix: Fix datetime formatting issues

* contrib-readme-action has updated readme (#273)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update README.md (#281)

* Update README.md

* Update README.md

Co-authored-by: Kibet Theo <[email protected]>

---------

Co-authored-by: Kibet Theo <[email protected]>

* contrib-readme-action has updated readme

* Feature: Setup KMM

* Fix: Workflow

* Fix: Failing tests

* contrib-readme-action has updated readme (#46)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#81)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#226)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harun Wangereka <[email protected]>

* contrib-readme-action has updated readme (#46)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#81)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#226)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harun Wangereka <[email protected]>

* contrib-readme-action has updated readme (#46)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#81)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#226)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harun Wangereka <[email protected]>

* Fix rebase conflict...

* Upgrade the Kotlin and KSP versions to 2.0.0 and 2.0.0-1.0.21 respectively...

* Add the Compose Compiler Gradle plugin into build.gradle.kts (:app, :chai, and :presentation)...

* Remove the references of the older Compose Compiler plugin and upgrade the rest of the libraries...

* Add shared...

* Re-version libraries and plugins to eliminate unexpected build errors...

* Remove unnecessary build generated files...

* contrib-readme-action has updated readme

* Remove unnecessary /shared build-generated files...

* Add the .kotlin directory to .gitignore...

* contrib-readme-action has updated readme (#46)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#81)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* contrib-readme-action has updated readme (#226)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Harun Wangereka <[email protected]>

* Add shared...

* Re-version libraries and plugins to eliminate unexpected build errors...

* Resolve minor corrections...

* Update app/src/main/res/values/strings.xml

---------

Co-authored-by: Evans Chepsiror <[email protected]>
Co-authored-by: chepsi <[email protected]>
Co-authored-by: Peter Chege <[email protected]>
Co-authored-by: Njoguu <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Thuo <[email protected]>
Co-authored-by: MamboBryan <[email protected]>
Co-authored-by: brian.orwe <[email protected]>
Co-authored-by: Harun Wangereka <[email protected]>
Co-authored-by: yveskalume <[email protected]>
Co-authored-by: Josphat Mwania <[email protected]>
Co-authored-by: Jacquiline Gitau <[email protected]>
Co-authored-by: Hannah Olukoye <[email protected]>
Co-authored-by: theophiluskibet <[email protected]>
Co-authored-by: Juma Allan <[email protected]>
Co-authored-by: Peter Chege <[email protected]>
Co-authored-by: Rachel Murabula <[email protected]>
Co-authored-by: robert-nganga <[email protected]>
Co-authored-by: Waitara <[email protected]>
Co-authored-by: Odhiambo Paul <[email protected]>
Co-authored-by: Zaccheaus Amenya <[email protected]>
Co-authored-by: kanake10 <[email protected]>
Co-authored-by: lokified <[email protected]>
Co-authored-by: jumapaul <[email protected]>
Co-authored-by: Terry Mochire <[email protected]>
Co-authored-by: Eton Otieno <[email protected]>
Co-authored-by: Raynafs <[email protected]>
Co-authored-by: ndiritumichael <[email protected]>
Co-authored-by: cliffgor <[email protected]>
Co-authored-by: azazaz <[email protected]>
Co-authored-by: Michael Bukachi <[email protected]>
Co-authored-by: Jane Waitara <[email protected]>
Co-authored-by: anuragkanojiya1 <[email protected]>
Co-authored-by: Kibet Theo <[email protected]>
  • Loading branch information
1 parent da65ab5 commit d2ec902
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 11 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,8 @@ build-logic/convention/build
/datasource/local/build
/datasource/remote/build
/datasource/build
**/build
**/build
/shared/build
/shared/data/build
/shared/datasource/build
shared/domain/build
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -404,4 +404,4 @@ We would endlessly like to thank the following contributors
</a>
</td></tr>
</table>
<!-- readme: contributors -end -->
<!-- readme: contributors -end -->
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
plugins {
alias(libs.plugins.droidconke.android.application)
alias(libs.plugins.droidconke.android.hilt)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.droidconke.android.application.firebase)
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">DroidconKE2023</string>
<string name="app_name">DroidconKe</string>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ internal fun Project.configureAndroidCompose(
compose = true
}

composeOptions {
kotlinCompilerExtensionVersion = libs.findVersion("composecompiler").get().toString()
}

dependencies {
val bom = libs.findLibrary("androidx-compose-bom").get()
add("implementation", platform(bom))
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.kotlin.serialization) apply false
Expand Down
1 change: 1 addition & 0 deletions chai/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
plugins {
alias(libs.plugins.droidconke.android.library)
alias(libs.plugins.droidconke.android.library.compose)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down
7 changes: 4 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ espresso = "3.5.1"
gradleplugin = "8.4.0"
gmsPlugin = "4.4.0"
hilt = "2.48.1"
kotlin = "1.9.10"
ksp = "1.9.10-1.0.13"
kotlin = "2.0.0"
ksp = "2.0.0-1.0.21"
lifecycle = "2.6.2"
room = "2.6.0"
ktor = "2.2.2"
Expand Down Expand Up @@ -146,7 +146,7 @@ kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", ve
ksp-gradlePlugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }

[bundles]
compose = ["coil-compose", "coil-svg", "compose-activity", "compose-compiler", "compose-material-3", "compose-materialIcons", "compose-runtimeLivedata", "compose-ui", "compose-ui-util", "compose-ui-tooling", "compose-ui-tooling-preview", "paging-compose", "compose-preview-customview", "compose-preview-customview-poolingcontainer", "compose-constraintlayout", "compose-lifecycle-runtime"]
compose = ["coil-compose", "coil-svg", "compose-activity", "compose-material-3", "compose-materialIcons", "compose-runtimeLivedata", "compose-ui", "compose-ui-util", "compose-ui-tooling", "compose-ui-tooling-preview", "paging-compose", "compose-preview-customview", "compose-preview-customview-poolingcontainer", "compose-constraintlayout", "compose-lifecycle-runtime"]
lifecycle = ["lifecycle-livedataKtx", "lifecycle-runtimeKtx", "lifecycle-viewmodel-compose"]
room = ["room-ktx", "room-paging", "room-runtime"]
ktor = ["ktor-core", "ktor-android", "ktor-json", "ktor-content-negotiation", "ktor-auth", "ktor-logging", "ktor-okhttp"]
Expand All @@ -156,6 +156,7 @@ test = ["junit4", "test-junit-ktx"]
[plugins]
android-application = { id = "com.android.application", version.ref = "gradleplugin" }
android-library = { id = "com.android.library", version.ref = "gradleplugin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin"}
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlyticsPlugin" }
firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "firebasePerfPlugin" }
Expand Down
1 change: 1 addition & 0 deletions presentation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
plugins {
alias(libs.plugins.droidconke.android.library)
alias(libs.plugins.droidconke.android.hilt)
alias(notation = libs.plugins.compose.compiler)
alias(libs.plugins.droidconke.android.library.compose)
}

Expand Down
1 change: 0 additions & 1 deletion shared/domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ kotlin {

android {
namespace = "ke.droidcon.kotlin.shared.domain"
compileSdk = 34
}

0 comments on commit d2ec902

Please sign in to comment.