diff --git a/.builds/android.yml b/.builds/android.yml
index 5e4c259..20cd88b 100644
--- a/.builds/android.yml
+++ b/.builds/android.yml
@@ -22,7 +22,7 @@ tasks:
sudo docker run \
-v /home/build:/home/build \
-u $(id -u):$(id -g) \
- thestr4ng3r/android:b2853cc \
+ thestr4ng3r/android:90d826e \
/bin/bash -c "cd /home/build/chiaki/android && ./gradlew assembleRelease bundleRelease"
cp chiaki/android/app/build/outputs/apk/release/app-release*.apk Chiaki.apk
cp chiaki/android/app/build/outputs/bundle/release/app-release*.aab Chiaki.aab
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 87b8761..99194ee 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -18,12 +18,11 @@ def chiakiVersion = "$chiakiVersionMajor.$chiakiVersionMinor.$chiakiVersionPatch
println("Determined Chiaki Version: $chiakiVersion")
android {
- compileSdkVersion 30
- buildToolsVersion "30.0.2"
+ compileSdkVersion 33
defaultConfig {
applicationId "com.metallic.chiaki"
minSdkVersion 21
- targetSdkVersion 30
+ targetSdkVersion 33
versionCode 11
versionName chiakiVersion
externalNativeBuild {
@@ -52,7 +51,7 @@ android {
}
externalNativeBuild {
cmake {
- version "3.10.2+"
+ version "3.22.1"
path rootCMakeLists
}
}
@@ -95,23 +94,23 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.2.0'
- implementation 'androidx.core:core-ktx:1.3.2'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- implementation 'androidx.recyclerview:recyclerview:1.1.0'
- implementation 'androidx.preference:preference:1.1.1'
- implementation 'com.google.android.material:material:1.2.1'
+ implementation 'androidx.appcompat:appcompat:1.6.0'
+ implementation 'androidx.core:core-ktx:1.9.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+ implementation 'androidx.recyclerview:recyclerview:1.2.1'
+ implementation 'androidx.preference:preference:1.2.0'
+ implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
- implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
- implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.2.0'
+ implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+ implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.5.1'
implementation "io.reactivex.rxjava2:rxjava:2.2.20"
implementation "io.reactivex.rxjava2:rxkotlin:2.4.0"
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
- def room_version = "2.2.6"
+ def room_version = "2.5.0"
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"
implementation "androidx.room:room-rxjava2:$room_version"
- implementation "com.squareup.moshi:moshi:1.9.2"
- kapt "com.squareup.moshi:moshi-kotlin-codegen:1.9.2"
+ implementation "com.squareup.moshi:moshi:1.14.0"
+ kapt "com.squareup.moshi:moshi-kotlin-codegen:1.14.0"
}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index fa14662..a0d28cb 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
+
+ android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+ android:exported="true">
diff --git a/android/app/src/main/cpp/oboe b/android/app/src/main/cpp/oboe
index 0ab5b12..8740d0f 160000
--- a/android/app/src/main/cpp/oboe
+++ b/android/app/src/main/cpp/oboe
@@ -1 +1 @@
-Subproject commit 0ab5b12a5bc3630a3d6c83b20eed2a669ebf7a24
+Subproject commit 8740d0fc321a55489dbbf6067298201b7d2e106d
diff --git a/android/app/src/main/java/com/metallic/chiaki/common/ManualHost.kt b/android/app/src/main/java/com/metallic/chiaki/common/ManualHost.kt
index 5825000..7065610 100644
--- a/android/app/src/main/java/com/metallic/chiaki/common/ManualHost.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/common/ManualHost.kt
@@ -3,7 +3,7 @@
package com.metallic.chiaki.common
import androidx.room.*
-import androidx.room.ForeignKey.SET_NULL
+import androidx.room.ForeignKey.Companion.SET_NULL
import io.reactivex.Completable
import io.reactivex.Flowable
import io.reactivex.Single
diff --git a/android/app/src/main/java/com/metallic/chiaki/common/RegisteredHost.kt b/android/app/src/main/java/com/metallic/chiaki/common/RegisteredHost.kt
index b96d88d..d920a8c 100644
--- a/android/app/src/main/java/com/metallic/chiaki/common/RegisteredHost.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/common/RegisteredHost.kt
@@ -3,7 +3,7 @@
package com.metallic.chiaki.common
import androidx.room.*
-import androidx.room.ColumnInfo.BLOB
+import androidx.room.ColumnInfo.Companion.BLOB
import com.metallic.chiaki.lib.RegistHost
import com.metallic.chiaki.lib.Target
import io.reactivex.Completable
diff --git a/android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt b/android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt
index 8334dc5..74257ac 100644
--- a/android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt
@@ -25,6 +25,8 @@ import io.reactivex.rxkotlin.addTo
import io.reactivex.schedulers.Schedulers
import okio.Buffer
import okio.Okio
+import okio.buffer
+import okio.source
import java.io.File
import java.io.IOException
@@ -164,7 +166,7 @@ fun importSettingsFromUri(activity: Activity, uri: Uri, disposable: CompositeDis
try
{
val inputStream = activity.contentResolver.openInputStream(uri) ?: throw IOException()
- val buffer = Okio.buffer(Okio.source(inputStream))
+ val buffer = inputStream.source().buffer()
val reader = JsonReader.of(buffer)
val adapter = moshi().serializedSettingsAdapter()
diff --git a/android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt b/android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt
index b0248be..a332961 100644
--- a/android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt
@@ -174,7 +174,7 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
.alpha(1.0f)
.setListener(object: AnimatorListenerAdapter()
{
- override fun onAnimationEnd(animation: Animator?)
+ override fun onAnimationEnd(animation: Animator)
{
binding.overlay.alpha = 1.0f
}
@@ -189,7 +189,7 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
.alpha(0.0f)
.setListener(object: AnimatorListenerAdapter()
{
- override fun onAnimationEnd(animation: Animator?)
+ override fun onAnimationEnd(animation: Animator)
{
binding.overlay.isGone = true
}
@@ -306,6 +306,8 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
dialog.show()
}
}
+
+ else -> {}
}
}
diff --git a/android/build.gradle b/android/build.gradle
index 7ec4859..cdfc5d6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.4.21'
+ ext.kotlin_version = '1.8.0'
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.1.1'
+ classpath 'com.android.tools.build:gradle:7.4.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index c21407a..7a0d628 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jan 15 11:37:05 CET 2021
+#Sun Feb 05 16:25:19 CET 2023
distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/cmake/OpenSSLExternalProject.cmake b/cmake/OpenSSLExternalProject.cmake
index 0538d48..1e1370d 100644
--- a/cmake/OpenSSLExternalProject.cmake
+++ b/cmake/OpenSSLExternalProject.cmake
@@ -33,8 +33,8 @@ endif()
find_program(MAKE_EXE NAMES gmake make)
ExternalProject_Add(OpenSSL-ExternalProject
- URL https://www.openssl.org/source/openssl-1.1.1d.tar.gz
- URL_HASH SHA256=1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2
+ URL https://www.openssl.org/source/openssl-1.1.1s.tar.gz
+ URL_HASH SHA256=c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa
INSTALL_DIR "${OPENSSL_INSTALL_DIR}"
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${OPENSSL_BUILD_ENV}
"/Configure" "--prefix=" no-shared ${OPENSSL_CONFIG_EXTRA_ARGS} "${OPENSSL_OS_COMPILER}"