Skip to content

Commit 1bd3276

Browse files
committed
updated dependencies + version bump to 1498
1 parent 3a98e44 commit 1bd3276

File tree

10 files changed

+27
-20
lines changed

10 files changed

+27
-20
lines changed

‎app/build.gradle.kts

+7-7
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ dependencies {
190190
implementation("androidx.interpolator:interpolator:1.0.0")
191191
implementation("androidx.gridlayout:gridlayout:1.0.0")
192192
// CameraX: https://developer.android.com/jetpack/androidx/releases/camera
193-
implementation("androidx.camera:camera-camera2:1.1.0-alpha12")
194-
implementation("androidx.camera:camera-lifecycle:1.1.0-alpha12")
195-
implementation("androidx.camera:camera-view:1.0.0-alpha32")
193+
implementation("androidx.camera:camera-camera2:1.1.0-beta01")
194+
implementation("androidx.camera:camera-lifecycle:1.1.0-beta01")
195+
implementation("androidx.camera:camera-view:1.1.0-beta01")
196196
// Google Play Services: https://developers.google.com/android/guides/releases
197197
implementation("com.google.android.gms:play-services-base:17.6.0")
198198
implementation("com.google.android.gms:play-services-basement:17.6.0")
@@ -206,13 +206,13 @@ dependencies {
206206
exclude(group = "com.google.firebase", module = "firebase-measurement-connector")
207207
}
208208
// Play Core: https://developer.android.com/reference/com/google/android/play/core/release-notes
209-
implementation("com.google.android.play:core:1.10.2")
209+
implementation("com.google.android.play:core:1.10.3")
210210
// ExoPlayer: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
211-
implementation("com.google.android.exoplayer:exoplayer-core:2.16.0")
211+
implementation("com.google.android.exoplayer:exoplayer-core:2.16.1")
212212
// The Checker Framework: https://checkerframework.org/CHANGELOG.md
213-
compileOnly("org.checkerframework:checker-qual:3.19.0")
213+
compileOnly("org.checkerframework:checker-qual:3.21.1")
214214
// OkHttp: https://github.com/square/okhttp/blob/master/CHANGELOG.md
215-
implementation("com.squareup.okhttp3:okhttp:4.9.2")
215+
implementation("com.squareup.okhttp3:okhttp:4.9.3")
216216
// ShortcutBadger: https://github.com/leolin310148/ShortcutBadger
217217
implementation("me.leolin:ShortcutBadger:1.1.22@aar")
218218
// ReLinker: https://github.com/KeepSafe/ReLinker/blob/master/CHANGELOG.md

‎app/src/main/java/org/thunderdog/challegram/ui/InstantViewController.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.drinkless.td.libcore.telegram.TdApi;
2020
import org.thunderdog.challegram.Log;
2121
import org.thunderdog.challegram.R;
22+
import org.thunderdog.challegram.config.Config;
2223
import org.thunderdog.challegram.core.Lang;
2324
import org.thunderdog.challegram.data.InlineResult;
2425
import org.thunderdog.challegram.data.InlineResultCommon;
@@ -349,7 +350,7 @@ protected View onCreateView (Context context) {
349350
recyclerView = (RecyclerView) Views.inflate(context(), R.layout.recycler, contentView);
350351
recyclerView.setHasFixedSize(true);
351352
recyclerView.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
352-
recyclerView.setOverScrollMode(View.OVER_SCROLL_NEVER);
353+
recyclerView.setOverScrollMode(Config.HAS_NICE_OVER_SCROLL_EFFECT ? View.OVER_SCROLL_IF_CONTENT_SCROLLS : View.OVER_SCROLL_NEVER);
353354
recyclerView.setLayoutParams(FrameLayoutFix.newParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
354355
recyclerView.setItemAnimator(null);
355356
contentView.addView(recyclerView);

‎buildSrc/build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
`kotlin-dsl`
33
}
44

5-
val kotlinVersion = "1.6.0"
5+
val kotlinVersion = "1.6.10"
66

77
gradlePlugin {
88
plugins {
@@ -45,11 +45,11 @@ configurations.all {
4545

4646
dependencies {
4747
compileOnly(gradleApi())
48-
implementation("com.android.tools.build:gradle:7.0.4")
48+
implementation("com.android.tools.build:gradle:7.1.0")
4949
implementation("com.google.gms:google-services:4.3.10")
5050
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
5151
// implementation("com.google.android.gms:oss-licenses-plugin:0.10.4")
52-
implementation("com.squareup.okhttp3:okhttp:4.9.2")
53-
implementation("com.squareup.okhttp3:logging-interceptor:4.9.2")
52+
implementation("com.squareup.okhttp3:okhttp:4.9.3")
53+
implementation("com.squareup.okhttp3:logging-interceptor:4.9.3")
5454
implementation("com.beust:klaxon:5.5")
5555
}

‎buildSrc/src/main/kotlin/Config.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object LibraryVersions {
1010
const val MULTIDEX = "2.0.1"
1111
const val DESUGAR = "1.1.5"
1212
const val ANDROIDX_CORE = "1.7.0"
13-
const val ANNOTATIONS = "1.2.0"
13+
const val ANNOTATIONS = "1.3.0"
1414
}
1515

1616
class AbiVariant (val flavor: String, vararg val filters: String = Config.SUPPORTED_ABI, val displayName: String = filters[0], val sideLoadOnly: Boolean = false) {

‎buildSrc/src/main/kotlin/me/vkryl/plugin/CMakePlugin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ open class CMakePlugin : Plugin<Project> {
2626
"-DCMAKE_SKIP_RPATH=ON",
2727
"-DCMAKE_C_VISIBILITY_PRESET=hidden",
2828
"-DCMAKE_CXX_VISIBILITY_PRESET=hidden",
29-
"--jobs=${Runtime.getRuntime().availableProcessors()}"
29+
"-DCMAKE_BUILD_PARALLEL_LEVEL=${Runtime.getRuntime().availableProcessors()}"
3030
)
3131
}
3232
}

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

‎scripts/setup-sdk.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
g#!/bin/bash
22
set -e
33
# shellcheck source=set-env.sh
44
source "$(dirname "$0")"/set-env.sh "$1"

‎scripts/update-exoplayer.sh

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
set -e
3+
# shellcheck source=set-env.sh
4+
source "$(pwd)/scripts/set-env.sh"
5+
6+
patch-exoplayer.sh

‎thirdparty/ExoPlayer

Submodule ExoPlayer updated 127 files

‎version.properties

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# App
2-
version.app=1497
2+
version.app=1498
33
version.major=0
44
# Anchor date point in app versioning
55
version.creation=873642600564
@@ -11,13 +11,13 @@ version.tdlib=79
1111
version.leveldb=5
1212

1313
# https://developer.android.com/studio#command-tools
14-
version.cmdline_tools=7583922
14+
version.cmdline_tools=8092744
1515

1616
# https://developer.android.com/ndk/downloads/revision_history
1717
version.ndk=22.1.7171670
1818
version.cmake=3.10.2.4988404
1919
# https://developer.android.com/studio/releases/build-tools
20-
version.build_tools=31.0.0
20+
version.build_tools=32.0.0
2121

2222
version.sdk_compile=31
2323
version.sdk_target=30

0 commit comments

Comments
 (0)