~thestr4ng3r/chiaki

e14083c87c10d734e0cdecd133d8a9e0d6bd00e6 — Florian Märkl 1 year, 17 days ago c2f0932 android-update
Update android target SDK to 33 and dependencies
M .builds/android.yml => .builds/android.yml +1 -1
@@ 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

M android/app/build.gradle => android/app/build.gradle +14 -15
@@ 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"
}

M android/app/src/main/AndroidManifest.xml => android/app/src/main/AndroidManifest.xml +3 -1
@@ 6,6 6,7 @@
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />

    <application
        android:allowBackup="true"


@@ 28,7 29,8 @@
        </provider>

        <activity android:name=".main.MainActivity"
            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />

M android/app/src/main/cpp/oboe => android/app/src/main/cpp/oboe +1 -1
@@ 1,1 1,1 @@
Subproject commit 0ab5b12a5bc3630a3d6c83b20eed2a669ebf7a24
Subproject commit 8740d0fc321a55489dbbf6067298201b7d2e106d

M android/app/src/main/java/com/metallic/chiaki/common/ManualHost.kt => android/app/src/main/java/com/metallic/chiaki/common/ManualHost.kt +1 -1
@@ 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

M android/app/src/main/java/com/metallic/chiaki/common/RegisteredHost.kt => android/app/src/main/java/com/metallic/chiaki/common/RegisteredHost.kt +1 -1
@@ 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

M android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt => android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt +3 -1
@@ 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()


M android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt => android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt +4 -2
@@ 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 -> {}
		}
	}


M android/build.gradle => android/build.gradle +2 -2
@@ 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

M android/gradle/wrapper/gradle-wrapper.properties => android/gradle/wrapper/gradle-wrapper.properties +3 -3
@@ 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

M cmake/OpenSSLExternalProject.cmake => cmake/OpenSSLExternalProject.cmake +2 -2
@@ 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}
			"<SOURCE_DIR>/Configure" "--prefix=<INSTALL_DIR>" no-shared ${OPENSSL_CONFIG_EXTRA_ARGS} "${OPENSSL_OS_COMPILER}"