Skip to content
This repository has been archived by the owner on Aug 2, 2024. It is now read-only.

Update Kotlin v2.0.0 & migrated Compose compiler #973

Closed
wants to merge 34 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2e3d272
Sunflower - Added, author_name, menu_filter_by_grow_zone string trans…
anselmoalexandre Sep 23, 2020
b742341
Sunflower, Added, author_name, menu_filter_by_grow_zone string transl…
anselmoalexandre Sep 23, 2020
d9173ae
Sunflower, Added, my_garden_title string translation to -pt
anselmoalexandre Sep 23, 2020
ae5b4ab
Sunflower, Added, plant_list_title string translation to -pt
anselmoalexandre Sep 23, 2020
452d324
Sunflower, Added, available string translation to -pt
anselmoalexandre Sep 23, 2020
66bf443
Sunflower, Added, plant_details_title string translation to -pt
anselmoalexandre Sep 23, 2020
7f9665b
Sunflower, Added, add_plant string translation to -pt
anselmoalexandre Sep 23, 2020
3b153fb
Sunflower, Added, added_plant_to_garden string translation to -pt
anselmoalexandre Sep 23, 2020
6d230d4
Sunflower, Added, garden_empty string translation to -pt
anselmoalexandre Sep 23, 2020
f9c5972
Sunflower, Added, plant_date_header string translation to -pt
anselmoalexandre Sep 23, 2020
a0a1ef6
Sunflower, Added, watered_date_header string translation to -pt
anselmoalexandre Sep 23, 2020
091ea34
Sunflower - Added, menu_item_share_plant string translation to -pt
anselmoalexandre Sep 23, 2020
9203640
Sunflower - Added, share_text_plant string translation to -pt
anselmoalexandre Sep 23, 2020
9fe5a7b
Sunflower - Added, gallery_title string translation to -pt
anselmoalexandre Sep 23, 2020
6c27015
Sunflower - Added, watering_needs_prefix string translation to -pt
anselmoalexandre Sep 23, 2020
f4d7de0
Sunflower - Added, one and other watering_needs_suffix string transla…
anselmoalexandre Sep 23, 2020
f859fe1
Sunflower - Added, one and other watering_next string translation to -pt
anselmoalexandre Sep 23, 2020
b504327
Sunflower - Added, ally_plant_item_image string translation to -pt
anselmoalexandre Sep 23, 2020
3228f5e
Sunflower - Added, gallery_content_description string translation to -pt
anselmoalexandre Sep 23, 2020
ed4610d
Sunflower - Added, plant_detail_content_description string translatio…
anselmoalexandre Sep 23, 2020
861811f
Merge pull request #1 from anselmoalexandre/aam-values-pt
anselmoalexandre Sep 23, 2020
527c80f
Update app/src/main/res/values-pt/strings.xml
anselmoalexandre Nov 20, 2020
27647b4
Update app/src/main/res/values-pt/strings.xml
anselmoalexandre Nov 20, 2020
6c66ca7
Update app/src/main/res/values-pt/strings.xml
anselmoalexandre Nov 20, 2020
995514f
Update app/src/main/res/values-pt/strings.xml
anselmoalexandre Nov 20, 2020
9d1f81d
Update app/src/main/res/values-pt/strings.xml
anselmoalexandre Nov 20, 2020
711fe32
Update app/src/main/res/values-pt/strings.xml
anselmoalexandre Nov 20, 2020
5074c54
Merge branch 'main' into master
anselmoalexandre Feb 13, 2021
560f113
Merge branch 'main' into master
calren Jun 15, 2021
2e04901
Merge branch 'main' into master
calren Jun 15, 2021
d173c1e
Merge branch 'android:master' into master
anselmoalexandre Sep 15, 2023
2d8b575
Merge branch 'android:master' into master
anselmoalexandre Dec 13, 2023
b1de714
Merge branch 'android:master' into master
anselmoalexandre May 22, 2024
a996447
Updated Kotlin version and migrated compose compiler
May 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ plugins {
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.compose.compiler)
}

android {
Expand Down Expand Up @@ -76,9 +77,6 @@ android {
dataBinding = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
packagingOptions {
// Multiple dependency bring these files in. Exclude them to enable
// our test APK to build (has no effect on our AARs)
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ plugins {
alias(libs.plugins.android.test) apply false
alias(libs.plugins.gradle.versions)
alias(libs.plugins.version.catalog.update)
alias(libs.plugins.compose.compiler) apply false
}

apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ guava = "33.1.0-jre"
hilt = "2.51.1"
hiltNavigationCompose = "1.2.0"
junit = "4.13.2"
kotlin = "1.9.23"
ksp = "1.9.23-1.0.20"
kotlin = "2.0.0"
ksp = "2.0.0-1.0.21"
# @keep
ktlint = "0.40.0"
ktx = "1.13.1"
Expand Down Expand Up @@ -123,3 +123,4 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
version-catalog-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "version-catalog-update" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
Loading