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.

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

Bump multiple dependencies #501

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3a0d9f3
Bump androidx.core:core-ktx from 1.0.1 to 1.10.1
dependabot[bot] May 11, 2023
2d5c5b3
Bump androidx.vectordrawable:vectordrawable-animated from 1.0.0 to 1.1.0
dependabot[bot] Apr 19, 2023
63c8f06
Bump androidXEspresso from 3.4.0 to 3.5.1
dependabot[bot] Apr 19, 2023
fb81ab3
Bump mockito from 2.28.2 to 5.3.0
dependabot[bot] Apr 19, 2023
3e3eaf1
Bump androidx.test.ext:junit from 1.1.3 to 1.1.5
dependabot[bot] Apr 19, 2023
90c0b54
Bump com.github.bumptech.glide:glide from 4.10.0 to 4.15.1
dependabot[bot] Mar 20, 2023
0bfaa28
Bump androidx.appcompat:appcompat from 1.0.2 to 1.6.1
dependabot[bot] Mar 13, 2023
3f63d98
Bump androidx.annotation:annotation from 1.0.2 to 1.6.0
dependabot[bot] Mar 13, 2023
3c39ca3
Bump junit:junit from 4.12 to 4.13.2
dependabot[bot] Mar 13, 2023
fe6234a
Bump pl.pragmatists:JUnitParams from 1.1.0 to 1.1.1
dependabot[bot] Mar 13, 2023
9cc4e1a
Bump gradle to version 8.2
vudzkostek Jul 9, 2023
9a7b1d5
Bump AGP and java
vudzkostek Jul 9, 2023
cc2057e
Bump kotlin 1.8.22
vudzkostek Jul 9, 2023
c560ad9
Bump android x lifecycle
vudzkostek Jul 9, 2023
4d6ece6
Bump material version
vudzkostek Jul 9, 2023
8bbe2e8
Bump orchestrator version
vudzkostek Jul 9, 2023
ce97726
Bump recycler view
vudzkostek Jul 9, 2023
f1cd20e
Remove redundant publish script line
vudzkostek Jul 10, 2023
c720e0c
Expose hamcrest dependency
vudzkostek Jul 10, 2023
ab09898
Revert "Expose hamcrest dependency"
vudzkostek Jul 11, 2023
b506589
Revert version name change
vudzkostek Jul 11, 2023
77b0dd5
Merge pull request #1 from DroidsOnRoids/clean_up
vudzkostek Jul 11, 2023
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ assertTextColorIsNot(R.id.some_color_list_text, R.color.another_state_list);

- *Color int*: `Color.parse("#ff00ff")`
- *Color resource*: `R.color.green`
- *Color attribute*: `R.attr.colorPrimary`
- *Color attribute*: `MaterialAttributes.colorPrimary`

Also Barista can check colors parsed from `declarable-style` custom attribute:
```java
Expand Down
9 changes: 9 additions & 0 deletions barista-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ android {
compose = true
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
}
Expand Down
9 changes: 9 additions & 0 deletions barista/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,15 @@ android {
}
namespace = "com.adevinta.android.barista"

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}

lint {
disable.add("InvalidPackage")
}
Expand Down
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,4 @@ org.gradle.configureondemand=true
org.gradle.jvmargs=-Xmx2048m
org.gradle.parallel=true
org.gradle.vfs.watch=true
#org.gradle.unsafe.configuration-cache=true
#org.gradle.unsafe.configuration-cache-problems=warn
#org.gradle.unsafe.configuration-cache.max-problems=100
signing.gnupg.executable=gpg
38 changes: 19 additions & 19 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
[versions]
gradlePlugin = "7.3.1"
kotlin = "1.7.20"
gradlePlugin = "8.0.2"
kotlin = "1.8.22"
nexusPublish = "1.1.0"
nexusStaging = "0.22.0"
compose = "1.3.1"
composeCompiler = "1.3.2"
androidXAppCompat = "1.0.2"
androidXAnnotation = "1.0.2"
androidXCore = "1.0.1"
androidXEspresso = "3.4.0"
androidXJUnit = "1.1.3"
compose = "1.4.3"
composeCompiler = "1.4.8"
androidXAppCompat = "1.6.1"
androidXAnnotation = "1.6.0"
androidXCore = "1.10.1"
androidXEspresso = "3.5.1"
androidXJUnit = "1.1.5"
androidXLegacy = "1.0.0"
androidXLifecycle = "2.3.1"
androidXMaterial = "1.2.0"
androidXOrchestrator = "1.4.1"
androidXRecyclerView = "1.0.0"
androidXVectorDrawable = "1.0.0"
androidXLifecycle = "2.6.1"
androidXMaterial = "1.9.0"
androidXOrchestrator = "1.4.2"
androidXRecyclerView = "1.3.0"
androidXVectorDrawable = "1.1.0"
androidXViewPager2 = "1.0.0"
uiAutomator = "2.2.0"

glide = "4.10.0"
glide = "4.15.1"

assertJ = "2.9.1"
jUnit = "4.12"
jUnitParams = "1.1.0"
mockito = "2.28.2"
jUnit = "4.13.2"
jUnitParams = "1.1.1"
mockito = "5.3.0"
mockitoKotlin = "1.5.0"

[libraries]
Expand Down Expand Up @@ -68,4 +68,4 @@ testing-jUnit = { module = "junit:junit", version.ref = "jUnit" }
testing-jUnitParams = { module = "pl.pragmatists:JUnitParams", version.ref = "jUnitParams" }
testing-mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockito" }
testing-mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
testing-mockito-kotlin = { module = "com.nhaarman:mockito-kotlin", version.ref = "mockitoKotlin" }
testing-mockito-kotlin = { module = "com.nhaarman:mockito-kotlin", version.ref = "mockitoKotlin" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sat Dec 03 13:54:10 CET 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading