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

Jump to bottom

Update dependencies to stay modern #39

Merged
merged 3 commits into from
Aug 9, 2022
Merged

Update dependencies to stay modern #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45a9c8e
Update dependencies to stay modern
jahunt1 Aug 9, 2022
439a3c4
Latest Gradle release
jahunt1 Aug 9, 2022
ea2ac15
Update Flurry version
jahunt1 Aug 9, 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: 2 additions & 2 deletions analyticskit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ android {
}

dependencies {
api "androidx.annotation:annotation:1.2.0"
api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion"
api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion"

testImplementation 'junit:junit:4.12'
testImplementation "junit:junit:$rootProject.ext.junit_version"
testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion"
testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
Expand Down
19 changes: 9 additions & 10 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,16 @@

buildscript {
ext {
kotlin_version = '1.5.10'
kotlin_version = '1.7.0'
}
repositories {
google()
jcenter()
maven { url 'https://maven.fabric.io/public' }
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.google.gms:google-services:4.3.8'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10"
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.google.gms:google-services:4.3.13'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
}
}

Expand All @@ -37,9 +36,8 @@ plugins {
allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }
maven { url 'https://maven.fabric.io/public' }
}
}

Expand All @@ -53,15 +51,16 @@ ext {
versionName = "$VERSION_NAME"

// dependency versions
annotationsVersion = "1.4.0"
assertjVersion = "3.14.0"
kotlinVersion = "1.5.10"
kotlinVersion = "1.7.0"
mockitoVersion = "2.23.0"
mockitoKotlinVersion = "2.2.0"

analytics_kit = ':analyticskit'

/** Unit Testing Dependency Versions **/
junit_version = "4.12"
junit_version = "4.13.2"
}

task clean(type: Delete) {
Expand Down
9 changes: 4 additions & 5 deletions firebase-provider/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,11 @@ android {
dependencies {
implementation project(path: rootProject.ext.analytics_kit)
api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion"
api 'androidx.annotation:annotation:1.2.0'
api "androidx.annotation:annotation:1.2.0"
compileOnly 'com.google.firebase:firebase-analytics:19.0.0'
api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion"
compileOnly 'com.google.firebase:firebase-analytics:21.1.0'

testImplementation 'com.google.firebase:firebase-analytics:19.0.0'
testImplementation 'junit:junit:4.12'
testImplementation 'com.google.firebase:firebase-analytics:21.1.0'
testImplementation "junit:junit:$rootProject.ext.junit_version"
testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion"
Expand Down
5 changes: 3 additions & 2 deletions flurry-provider/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@ android {
dependencies {
implementation project(path: rootProject.ext.analytics_kit)
api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion"
api "androidx.annotation:annotation:1.2.0"
implementation 'com.flurry.android:analytics:12.13.0'
api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion"
compileOnly 'com.flurry.android:analytics:13.3.0'

testImplementation 'com.flurry.android:analytics:13.3.0'
testImplementation "junit:junit:$rootProject.ext.junit_version"
testImplementation "org.assertj:assertj-core:$rootProject.ext.assertjVersion"
testImplementation "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion"
Expand Down
2 changes: 1 addition & 1 deletion google-analytics-provider/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {
dependencies {
implementation project(path: rootProject.ext.analytics_kit)
api "org.jetbrains.kotlin:kotlin-stdlib:$rootProject.ext.kotlinVersion"
api "androidx.annotation:annotation:1.2.0"
api "androidx.annotation:annotation:$rootProject.ext.annotationsVersion"
compileOnly 'com.google.android.gms:play-services-analytics:17.0.0'

testImplementation 'com.google.android.gms:play-services-analytics:17.0.0'
Comment on lines 53 to 55
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a newer version of the Google Analytics SDK too, but I think there were some breaking changes and I would have had to conform to different function signatures. Let's update to the latest SDK in a follow-up PR.

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-6.8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading