From 4b307cad2cab32cac7179b48e706620a4fd9bff6 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sat, 23 Oct 2021 22:20:07 -0700 Subject: [PATCH] Random minor changes --- app/build.gradle.kts | 8 ++++---- buildSrc/build.gradle.kts | 4 ++-- native/jni/core/thread.cpp | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b3d547558..0cf717e23 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -103,7 +103,7 @@ dependencies { implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}") implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}") - val vOkHttp = "4.9.1" + val vOkHttp = "4.9.2" implementation("com.squareup.okhttp3:okhttp:${vOkHttp}") implementation("com.squareup.okhttp3:logging-interceptor:${vOkHttp}") @@ -116,18 +116,18 @@ dependencies { implementation("androidx.room:room-ktx:${vRoom}") kapt("androidx.room:room-compiler:${vRoom}") - val vNav = "2.4.0-alpha08" + val vNav = "2.4.0-alpha10" implementation("androidx.navigation:navigation-fragment-ktx:${vNav}") implementation("androidx.navigation:navigation-ui-ktx:${vNav}") implementation("androidx.biometric:biometric:1.1.0") - implementation("androidx.constraintlayout:constraintlayout:2.1.0") + implementation("androidx.constraintlayout:constraintlayout:2.1.1") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.browser:browser:1.3.0") implementation("androidx.preference:preference:1.1.1") implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.fragment:fragment-ktx:1.3.6") - implementation("androidx.work:work-runtime-ktx:2.7.0-beta01") + implementation("androidx.work:work-runtime-ktx:2.7.0") implementation("androidx.transition:transition:1.4.1") implementation("androidx.core:core-ktx:1.6.0") implementation("com.google.android.material:material:1.4.0") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 1d1a1459b..1b6c15a80 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,9 +16,9 @@ gradlePlugin { } dependencies { - implementation(kotlin("gradle-plugin", "1.5.30")) + implementation(kotlin("gradle-plugin", "1.5.31")) implementation("com.android.tools.build:gradle:7.0.3") - implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-alpha08") + implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-alpha10") implementation("io.michaelrocks:paranoid-gradle-plugin:0.3.5") implementation("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r") } diff --git a/native/jni/core/thread.cpp b/native/jni/core/thread.cpp index 24f7b088c..712e19644 100644 --- a/native/jni/core/thread.cpp +++ b/native/jni/core/thread.cpp @@ -6,10 +6,6 @@ using namespace std; -#ifndef PTHREAD_COND_INITIALIZER_MONOTONIC_NP -#define PTHREAD_COND_INITIALIZER_MONOTONIC_NP { { 1 << 1 } } -#endif - #define THREAD_IDLE_MAX_SEC 60 #define CORE_POOL_SIZE 3