From ea5c3a7c5efaa38970461a85b7d8911e9f4a4eca Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Thu, 17 Aug 2023 15:31:16 -0300 Subject: [PATCH] Update compileSdk to 34. --- .../segmentedprogressbar/SegmentedProgressBar.kt | 2 +- .../ui/custom/CustomChatColorGradientToolView.kt | 2 +- .../securesms/scribbles/RotationDialView.kt | 2 +- .../stories/viewer/page/StoryViewerPageFragment.kt | 10 +++++----- constants.gradle.kts | 8 ++++---- reproducible-builds/Dockerfile | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt index a572f6fe46..3cf80a6719 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/segmentedprogressbar/SegmentedProgressBar.kt @@ -197,7 +197,7 @@ class SegmentedProgressBar : View, ViewPager.OnPageChangeListener, View.OnTouchL setLayerType(LAYER_TYPE_SOFTWARE, null) } - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) segments.forEachIndexed { index, segment -> diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt index e1781a948a..b59dee3540 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/custom/CustomChatColorGradientToolView.kt @@ -287,7 +287,7 @@ class CustomChatColorGradientToolView @JvmOverloads constructor( } override fun onScroll( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt index 3a714e7d7a..ef32334d57 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/RotationDialView.kt @@ -187,7 +187,7 @@ class RotationDialView @JvmOverloads constructor( return true } - override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { + override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { val degreeIncrement: Float = distanceX / dimensions.spaceBetweenAngleIndicators val prevDialDegrees = getDialDegrees(degrees) val newDialDegrees = getDialDegrees(degrees + degreeIncrement) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt index 29b186e384..690319781a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryViewerPageFragment.kt @@ -1231,7 +1231,7 @@ class StoryViewerPageFragment : return true } - override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { + override fun onScroll(e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean { val isFirstStory = sharedViewModel.stateSnapshot.page == 0 val isLastStory = sharedViewModel.stateSnapshot.pages.lastIndex == sharedViewModel.stateSnapshot.page val isXMagnitudeGreaterThanYMagnitude = abs(distanceX) > abs(distanceY) || viewToTranslate.translationX > 0f @@ -1240,7 +1240,7 @@ class StoryViewerPageFragment : sharedViewModel.setIsChildScrolling(isXMagnitudeGreaterThanYMagnitude || isFirstAndHasYTranslationOrNegativeY || isLastAndHasYTranslationOrNegativeY) if (isFirstStory) { - val delta = max(0f, (e2.rawY - e1.rawY)) / 3f + val delta = max(0f, (e2.rawY - (e1?.rawY ?: 0f))) / 3f val percent = INTERPOLATOR.getInterpolation(delta / maxSlide) val distance = maxSlide * percent @@ -1249,7 +1249,7 @@ class StoryViewerPageFragment : } if (isLastStory) { - val delta = max(0f, (e1.rawY - e2.rawY)) / 3f + val delta = max(0f, ((e1?.rawY ?: 0f) - e2.rawY)) / 3f val percent = -INTERPOLATOR.getInterpolation(delta / maxSlide) val distance = maxSlide * percent @@ -1257,7 +1257,7 @@ class StoryViewerPageFragment : viewToTranslate.translationY = distance } - val delta = max(0f, (e2.rawX - e1.rawX)) / 3f + val delta = max(0f, (e2.rawX - (e1?.rawX ?: 0f))) / 3f val percent = INTERPOLATOR.getInterpolation(delta / maxSlide) val distance = maxSlide * percent @@ -1269,7 +1269,7 @@ class StoryViewerPageFragment : return true } - override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { + override fun onFling(e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean { val isSideSwipe = abs(velocityX) > abs(velocityY) if (!isSideSwipe) { return false diff --git a/constants.gradle.kts b/constants.gradle.kts index 79a0a00f3b..5bebdd47f7 100644 --- a/constants.gradle.kts +++ b/constants.gradle.kts @@ -1,6 +1,6 @@ -val signalBuildToolsVersion by extra("32.0.0") -val signalCompileSdkVersion by extra("android-33") +val signalBuildToolsVersion by extra("34.0.0") +val signalCompileSdkVersion by extra("android-34") val signalTargetSdkVersion by extra(31) val signalMinSdkVersion by extra(21) -val signalJavaVersion by extra(JavaVersion.VERSION_11) -val signalKotlinJvmTarget by extra("11") \ No newline at end of file +val signalJavaVersion by extra(JavaVersion.VERSION_17) +val signalKotlinJvmTarget by extra("17") \ No newline at end of file diff --git a/reproducible-builds/Dockerfile b/reproducible-builds/Dockerfile index 3fed2e10d5..7a2806fab0 100644 --- a/reproducible-builds/Dockerfile +++ b/reproducible-builds/Dockerfile @@ -12,11 +12,11 @@ RUN apt install -oAcquire::https::Verify-Peer=false -y ca-certificates # Back to normal, verification back on RUN apt update -RUN apt install -y git openjdk-11-jdk openjdk-17-jdk unzip wget +RUN apt install -y git openjdk-17-jdk unzip wget -ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-7583922_latest.zip -ENV ANDROID_API_LEVELS android-33 -ENV ANDROID_BUILD_TOOLS_VERSION 32.0.0 +ENV ANDROID_COMMAND_LINE_TOOLS_FILENAME commandlinetools-linux-10406996_latest.zip +ENV ANDROID_API_LEVELS android-34 +ENV ANDROID_BUILD_TOOLS_VERSION 34.0.0 ENV ANDROID_HOME /usr/local/android-sdk-linux ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/bin