diff --git a/.gitignore b/.gitignore index 73ee5927..65a0f327 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ local.properties # Android Studio generated files and folders captures/ -app/phone/libre/release/baselineProfiles +app/phone/libre/release/ .kotlin .externalNativeBuild/ .cxx/ diff --git a/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-arm64-v8a.dm b/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-arm64-v8a.dm index 29f7dc6a..39baddf3 100644 Binary files a/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-arm64-v8a.dm and b/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-arm64-v8a.dm differ diff --git a/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-armeabi-v7a.dm b/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-armeabi-v7a.dm index 29f7dc6a..39baddf3 100644 Binary files a/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-armeabi-v7a.dm and b/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-armeabi-v7a.dm differ diff --git a/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-x86.dm b/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-x86.dm index 29f7dc6a..39baddf3 100644 Binary files a/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-x86.dm and b/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-x86.dm differ diff --git a/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-x86_64.dm b/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-x86_64.dm index 29f7dc6a..39baddf3 100644 Binary files a/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-x86_64.dm and b/app/phone/libre/release/baselineProfiles/0/ananas-v0.14.2-libre-x86_64.dm differ diff --git a/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-arm64-v8a.dm b/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-arm64-v8a.dm index 301e21af..fc3c125e 100644 Binary files a/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-arm64-v8a.dm and b/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-arm64-v8a.dm differ diff --git a/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-armeabi-v7a.dm b/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-armeabi-v7a.dm index 301e21af..fc3c125e 100644 Binary files a/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-armeabi-v7a.dm and b/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-armeabi-v7a.dm differ diff --git a/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-x86.dm b/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-x86.dm index 301e21af..fc3c125e 100644 Binary files a/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-x86.dm and b/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-x86.dm differ diff --git a/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-x86_64.dm b/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-x86_64.dm index 301e21af..fc3c125e 100644 Binary files a/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-x86_64.dm and b/app/phone/libre/release/baselineProfiles/1/ananas-v0.14.2-libre-x86_64.dm differ diff --git a/app/phone/libre/release/output-metadata.json b/app/phone/libre/release/output-metadata.json index eac405bd..46f15ce0 100644 --- a/app/phone/libre/release/output-metadata.json +++ b/app/phone/libre/release/output-metadata.json @@ -16,7 +16,7 @@ } ], "attributes": [], - "versionCode": 5, + "versionCode": 6, "versionName": "0.14.2", "outputFile": "ananas-v0.14.2-libre-armeabi-v7a.apk" }, @@ -29,23 +29,10 @@ } ], "attributes": [], - "versionCode": 5, + "versionCode": 6, "versionName": "0.14.2", "outputFile": "ananas-v0.14.2-libre-x86.apk" }, - { - "type": "ONE_OF_MANY", - "filters": [ - { - "filterType": "ABI", - "value": "arm64-v8a" - } - ], - "attributes": [], - "versionCode": 5, - "versionName": "0.14.2", - "outputFile": "ananas-v0.14.2-libre-arm64-v8a.apk" - }, { "type": "ONE_OF_MANY", "filters": [ @@ -55,9 +42,22 @@ } ], "attributes": [], - "versionCode": 5, + "versionCode": 6, "versionName": "0.14.2", "outputFile": "ananas-v0.14.2-libre-x86_64.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", + "value": "arm64-v8a" + } + ], + "attributes": [], + "versionCode": 6, + "versionName": "0.14.2", + "outputFile": "ananas-v0.14.2-libre-arm64-v8a.apk" } ], "elementType": "File", @@ -68,8 +68,8 @@ "baselineProfiles": [ "baselineProfiles/1/ananas-v0.14.2-libre-armeabi-v7a.dm", "baselineProfiles/1/ananas-v0.14.2-libre-x86.dm", - "baselineProfiles/1/ananas-v0.14.2-libre-arm64-v8a.dm", - "baselineProfiles/1/ananas-v0.14.2-libre-x86_64.dm" + "baselineProfiles/1/ananas-v0.14.2-libre-x86_64.dm", + "baselineProfiles/1/ananas-v0.14.2-libre-arm64-v8a.dm" ] }, { @@ -78,8 +78,8 @@ "baselineProfiles": [ "baselineProfiles/0/ananas-v0.14.2-libre-armeabi-v7a.dm", "baselineProfiles/0/ananas-v0.14.2-libre-x86.dm", - "baselineProfiles/0/ananas-v0.14.2-libre-arm64-v8a.dm", - "baselineProfiles/0/ananas-v0.14.2-libre-x86_64.dm" + "baselineProfiles/0/ananas-v0.14.2-libre-x86_64.dm", + "baselineProfiles/0/ananas-v0.14.2-libre-arm64-v8a.dm" ] } ], diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index e9fe7b08..4dc0bbb3 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ import org.gradle.api.JavaVersion object Versions { - const val appCode = 5 + const val appCode = 6 const val appName = "0.14.2" const val compileSdk = 34 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8bb99237..39601046 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ kotlin = "2.0.0" kotlinx-serialization = "1.7.0" ksp = "2.0.0-1.0.22" ktlint = "12.1.1" -libmpv = "0.2.0" +libmpv = "0.3.0" material = "1.12.0" media3-ffmpeg-decoder = "1.3.1+2" timber = "5.0.1"