Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
blootsvoets committed Apr 25, 2023
1 parent 130763c commit 5e4fe1a
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 28 deletions.
2 changes: 1 addition & 1 deletion avro-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ android {
description = "Version of Apache Avro compatible with Android"

dependencies {
implementation("org.slf4j:slf4j-api:2.0.6")
implementation("org.slf4j:slf4j-api:2.0.7")

testImplementation(project(":radar-commons-android")) {
exclude group: 'org.apache.avro', module: 'avro'
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* limitations under the License.
*/
buildscript {
ext.kotlin_version = '1.8.0'
ext.dokka_version = '1.7.20'
ext.kotlin_version = '1.8.21'
ext.dokka_version = '1.8.10'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath 'com.android.tools.build:gradle:8.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.bjoernq:unmockplugin:0.7.9'
classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.18"
Expand All @@ -30,8 +30,8 @@ buildscript {
}

plugins {
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
id("com.github.ben-manes.versions") version "0.44.0"
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("com.github.ben-manes.versions") version "0.46.0"
}

allprojects {
Expand Down Expand Up @@ -62,7 +62,7 @@ subprojects {
repositories {
google()
mavenCentral()
maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
// maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
}

dependencies {
Expand Down Expand Up @@ -91,8 +91,8 @@ subprojects {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
jvmTarget = '11'
apiVersion = '1.7'
languageVersion = '1.7'
apiVersion = '1.8'
languageVersion = '1.8'
}
}
}
Expand All @@ -119,5 +119,5 @@ nexusPublishing {
}

wrapper {
gradleVersion '7.6'
gradleVersion '8.1.1'
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
android.disableAutomaticComponentCreation=true
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx3072m -XX:MaxMetaspaceSize=1536m -Dfile.encoding=UTF-8 -XX:+UseParallelGC
org.gradle.parallel=true
org.gradle.vfs.watch=true

kotlin.code.style=official

android.defaults.buildfeatures.buildconfig=true

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
Expand Down
4 changes: 2 additions & 2 deletions gradle/test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ ext {

dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.slf4j:slf4j-simple:2.0.6'
testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'
testImplementation 'org.slf4j:slf4j-simple:2.0.7'
testImplementation 'com.squareup.okhttp3:mockwebserver:4.11.0'

// Core library
androidTestImplementation "androidx.test:core:$androidXCoreVersion"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 6 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -144,15 +141,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
2 changes: 1 addition & 1 deletion plugins/radar-android-login-qr/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ description = 'RADAR Android QR LoginManager.'
dependencies {
api project(':radar-commons-android')
implementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
// Support Android 14+
//noinspection GradleDependency
implementation 'com.google.zxing:core:3.4.0'
Expand Down
4 changes: 2 additions & 2 deletions plugins/radar-android-ppg/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ description = 'Plugin for RADAR passive remote monitoring app for measuring PPG

dependencies {
api project(':radar-commons-android')
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
}

Expand Down
10 changes: 5 additions & 5 deletions radar-commons-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ dependencies {
exclude group: 'org.apache.avro', module: 'avro'
}
api(project(':avro-android'))
api("org.slf4j:slf4j-api:2.0.6")
api("androidx.appcompat:appcompat:1.6.0")
api("org.slf4j:slf4j-api:2.0.7")
api("androidx.appcompat:appcompat:1.6.1")

implementation "com.squareup.okhttp3:okhttp:4.10.0"
implementation "com.squareup.okhttp3:okhttp:4.11.0"
implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.1.0"
implementation "androidx.legacy:legacy-support-v4:1.0.0"

api "androidx.lifecycle:lifecycle-service:2.5.1"
api "androidx.lifecycle:lifecycle-service:2.6.1"

implementation platform('com.google.firebase:firebase-bom:31.2.0')
implementation platform('com.google.firebase:firebase-bom:31.5.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-config'
implementation 'com.google.firebase:firebase-crashlytics'
Expand Down

0 comments on commit 5e4fe1a

Please sign in to comment.