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
Update libraries #1299
Update libraries #1299
Conversation
@@ -37,6 +38,7 @@ class BlobConverterInjectorJsTest { | |||
|
|||
@UiThreadTest | |||
@Test | |||
@SdkSuppress(minSdkVersion = 24) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently, spy
is not supported on API < 24
mockito/mockito#2075 (comment)
…m/duckduckgo/Android into feature/cristian/update_libraries
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for doing this @cmonfortep
@@ -34,12 +34,12 @@ version.google.android.material=1.2.1 | |||
version.google.dagger=2.37 | |||
version.io.reactivex.rxjava2..rxandroid=2.0.2 | |||
version.io.reactivex.rxjava2..rxjava=2.2.9 | |||
version.kotlin=1.4.10 | |||
version.kotlin=1.5.20 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we maybe remove the one we have in the main build.gradle
and used this one. They are easy to get out of sync, in fact, they had different versions :/
# Conflicts: # versions.properties
build.gradle
Outdated
@@ -16,7 +14,7 @@ buildscript { | |||
} | |||
dependencies { | |||
classpath 'com.android.tools.build:gradle:4.1.2' | |||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | |||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:_" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@aitorvs I think this is the way we can avoid having to duplicate the kotlin version in 2 files, but not 100% sure.
By executing ./gradlew buildEnvironment
seems this will work: org.jetbrains.kotlin:kotlin-gradle-plugin:{require 1.5.20; reject _} -> 1.5.20
, so I guess is ok
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's interesting! I seems it works because the _
is not really a valid version and then it falls back to any other (latest) version we might have. I think a more secure approach might be the following, in the root build.gradle
buildscript {
def versionPropsFile = file('versions.properties')
Properties versionProps = new Properties()
if (versionPropsFile.canRead()) {
versionProps.load(new FileInputStream(versionPropsFile))
}
ext.kotlin_version = versionProps['version.kotlin']
...
# Conflicts: # app/src/androidTest/java/com/duckduckgo/app/email/EmailInjectorJsTest.kt
Task/Issue URL: https://app.asana.com/0/414730916066338/1200541903185345/f
Tech Design URL:
CC:
Description:
This PR updates the following libraries:
Steps to test this PR:
Smoke test:
Note: All the changes have been tested already on API 21
Internal references:
Software Engineering Expectations
Technical Design Template