diff --git a/CHANGELOG.md b/CHANGELOG.md index 56b77f7..bf7fcdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [5-r.1-beta.3] - 2024-01-18 + +### Changed + +* Change the compile and target SDK version of Android OS to 14.0 (API 34). + * Upgrade the version of Android Gradle Plugin from 8.0.2 to 8.1.1. + * Upgrade the version of Gradle from 8.1.1 to 8.2. + * Change the minimum version of Android Studio to Hedgehog(2023.1.1). + +### Fixed + +* Fix a problem where the result loaded exp3.json is put into map even if it was null. +* Replace deprecated notation in `build.gradle` and `AndroidManifest.xml`. + + ## [5-r.1-beta.2] - 2023-09-28 ### Changed @@ -99,6 +114,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * New released! +[5-r.1-beta.3]: https://github.com/Live2D/CubismJavaSamples/compare/5-r.1-beta.2...5-r.1-beta.3 [5-r.1-beta.2]: https://github.com/Live2D/CubismJavaSamples/compare/5-r.1-beta.1...5-r.1-beta.2 [5-r.1-beta.1]: https://github.com/Live2D/CubismJavaSamples/compare/4-r.1...5-r.1-beta.1 [4-r.1]: https://github.com/Live2D/CubismJavaSamples/compare/4-r.1-beta.4...4-r.1 diff --git a/Framework b/Framework index 596cf12..fa02ff6 160000 --- a/Framework +++ b/Framework @@ -1 +1 @@ -Subproject commit 596cf12d2b82dae9227fb447d2814b34f09798f1 +Subproject commit fa02ff60af812efe8fdc5ce84965da5f8ccb5b2e diff --git a/README.ja.md b/README.ja.md index 92a3ad0..12cc66a 100644 --- a/README.ja.md +++ b/README.ja.md @@ -67,16 +67,16 @@ Android Studioでプロジェクトを開きビルドすることを推奨しま | 開発ツール | バージョン | |----------------|------------------| -| Android Studio | Giraffe 2022.3.1 | +| Android Studio | Hedgehog 2023.1.1 | | CMake | 3.1.0 | -| Gradle | 8.1.1 | +| Gradle | 8.2 | ### Android | Android SDK tools | バージョン | | --- |--------------| | Android NDK | 21.4.7075529 | -| Android SDK | 33.0.0 | +| Android SDK | 34.0.0 | | CMake | 3.1.0 | ## 動作確認環境 @@ -88,7 +88,7 @@ Android Studioでプロジェクトを開きビルドすることを推奨しま ### Android | バージョン | デバイス | Tegra | |-------|----------|-------| -| 13 | Pixel 7a | | +| 14 | Pixel 7a | | | 7.1.1 | Nexus 9 | ✔ | | 4.1 | Pixel 5 | | diff --git a/README.md b/README.md index 3b854ef..7045fca 100644 --- a/README.md +++ b/README.md @@ -67,16 +67,16 @@ Please refer to [CHANGELOG.md](CHANGELOG.md) for the changelog of this repositor | Development Tools | Version | |-------------------|--| -| Android Studio | Giraffe 2022.3.1 | +| Android Studio | Hedgehog 2023.1.1 | | CMake | 3.1.0 | -| Gradle | 8.1.1 | +| Gradle | 8.2 | ### Android | Android SDK tools | Version | | --- |--------------| | Android NDK | 21.4.7075529 | -| Android SDK | 33.0.0 | +| Android SDK | 34.0.0 | | CMake | 3.1.0 | ## Operation environment @@ -89,7 +89,7 @@ This sample application runs with **Java SE 7** or higher Java versions. | Version | Device | Tegra | |---------|----------| --- | -| 13 | Pixel 7a || +| 14 | Pixel 7a || | 7.1.1 | Nexus 9 | ✔︎ | | 4.1 | Pixel 5 || diff --git a/Sample/build.gradle b/Sample/build.gradle index 4376aed..78035bd 100644 --- a/Sample/build.gradle +++ b/Sample/build.gradle @@ -4,7 +4,7 @@ plugins { android { namespace = "com.live2d.demo" - compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger() + compileSdk PROP_COMPILE_SDK_VERSION.toInteger() defaultConfig { applicationId "com.live2d.demo" @@ -40,7 +40,7 @@ android { } } - flavorDimensions "mode" + flavorDimensions = ["mode"] productFlavors { Full { dimension = "mode" @@ -56,8 +56,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 } - - lintOptions { + lint { abortOnError false } } diff --git a/Sample/src/full/AndroidManifest.xml b/Sample/src/full/AndroidManifest.xml index dbc4bc0..944f4f0 100644 --- a/Sample/src/full/AndroidManifest.xml +++ b/Sample/src/full/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + - +