Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Gradle to 7.4.2 & AGP to 7.2.1 #6824

Merged
merged 11 commits into from
Jul 7, 2022
Merged

Update Gradle to 7.4.2 & AGP to 7.2.1 #6824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d9399b9
Update Gradle to 7.4.2
oguzkocer Jun 28, 2022
493b279
Update AGP to 7.2.1
oguzkocer Jun 28, 2022
c36c8ce
Update Dagger to 2.42
oguzkocer Jul 1, 2022
968a1bd
Merge pull request #6846 from woocommerce/update-dagger-to-2.42
oguzkocer Jul 4, 2022
e2fbabf
Update our dependencies to AGP 7.2.1 PRs
oguzkocer Jul 6, 2022
3a184cc
Update our dependencies to AGP 7.2.1 tagged version
oguzkocer Jul 7, 2022
7551671
Merge remote-tracking branch 'origin/trunk' into upgrade-gradle-to-7.…
oguzkocer Jul 7, 2022
13102ac
Merge remote-tracking branch 'origin/upgrade-gradle-to-7.4.2-agp-to-7…
oguzkocer Jul 7, 2022
339adad
Exclude FluxC from tracks:experimentation dependency
oguzkocer Jul 7, 2022
281c79d
Adds missing couponsEnabled argument to unit tests
oguzkocer Jul 7, 2022
c4b4b9e
Merge pull request #6876 from woocommerce/update-dependencies-to-agp-…
oguzkocer Jul 7, 2022
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: 3 additions & 1 deletion WooCommerce/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,9 @@ dependencies {
exclude group: "com.android.support"
}

implementation "com.automattic.tracks:experimentation:trunk-f25f5b5e77df8313f19d47d07e7411256d18df79"
implementation("com.automattic.tracks:experimentation:trunk-f25f5b5e77df8313f19d47d07e7411256d18df79") {
exclude group: "org.wordpress", module: "fluxc"
}
implementation 'com.automattic:Automattic-Tracks-Android:2.2.0'

implementation("${gradle.ext.fluxCBinaryPath}:$fluxCVersion") {
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/kotlin/com/woocommerce/android/ui/coupons/details/CouponDetailsViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class CouponDetailsViewModelTest : BaseUnitTest() {
Result.success(Unit)
}
private val wooCommerceStore: WooCommerceStore = mock {
on { getSiteSettings(any()) } doReturn WCSettingsModel(0, "USD", LEFT, "", "", 2)
on { getSiteSettings(any()) } doReturn WCSettingsModel(0, "USD", LEFT, "", "", 2, couponsEnabled = false)
}
private val currencyFormatter: CurrencyFormatter = mock {
on { formatCurrency(any<BigDecimal>(), any(), any()) } doAnswer { it.arguments[0].toString() }
Expand Down
6 changes: 4 additions & 2 deletions WooCommerce/src/test/kotlin/com/woocommerce/android/util/DefaultCurrencyFormatterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ class DefaultCurrencyFormatterTest : BaseUnitTest() {
currencyPosition = WCSettingsModel.CurrencyPosition.RIGHT_SPACE,
currencyThousandSeparator = ",",
currencyDecimalSeparator = ".",
currencyDecimalNumber = 2
currencyDecimalNumber = 2,
couponsEnabled = false
)
val secondSettings = firstSettings.copy(currencyCode = "USD")
whenever(selectedSite.observe()).thenReturn(sitesFlow)
Expand All @@ -108,7 +109,8 @@ class DefaultCurrencyFormatterTest : BaseUnitTest() {
currencyPosition = WCSettingsModel.CurrencyPosition.RIGHT_SPACE,
currencyThousandSeparator = ",",
currencyDecimalSeparator = ".",
currencyDecimalNumber = 2
currencyDecimalNumber = 2,
couponsEnabled = false
)
whenever(selectedSite.observe()).thenReturn(sitesFlow)
// First time return an error
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ tasks.register("installGitHooks", Copy) {
}

ext {
fluxCVersion = '1.45.1'
fluxCVersion = 'trunk-f44a381615f6d850e9c95071469424fbde6daff8'
glideVersion = '4.13.2'
coilVersion = '2.1.0'
constraintLayoutVersion = '1.2.0'
Expand All @@ -98,10 +98,10 @@ ext {
appCompatVersion = '1.4.1'
materialVersion = '1.6.1'
hiltJetpackVersion = '1.0.0'
wordPressUtilsVersion = "2.3.0"
mediapickerVersion = 'trunk-d0db2634cf27511bec3ef9b837f9cfe27c5ab601'
wordPressLoginVersion = '0.13.0'
aboutAutomatticVersion = '0.0.4'
wordPressUtilsVersion = '2.6.0'
mediapickerVersion = '0.1.0'
wordPressLoginVersion = '0.15.0'
aboutAutomatticVersion = '0.0.6'

// Compose and its module versions need to be consistent with each other (for example 'compose-theme-adapter')
composeVersion = "1.1.1"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pluginManagement {
gradle.ext.agpVersion = '7.1.1'
gradle.ext.daggerVersion = '2.40.5'
gradle.ext.agpVersion = '7.2.1'
gradle.ext.daggerVersion = '2.42'
gradle.ext.detektVersion = '1.19.0'
gradle.ext.kotlinVersion = '1.6.10'
gradle.ext.navigationVersion = '2.4.1'
Expand Down