v4.0.10-0: YT39のマージ

t-yoshi · Oct 16, 2021 · f8c587b · f8c587b
1 parent d4824ef
commit f8c587b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.5.30'
+    ext.kotlin_version = '1.5.31'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.18"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
@@ -33,9 +33,9 @@ task clean(type: Delete) {
 }
 
 ext {
-    version_code = 4_00_09_00
-    version_name = "4.0.9-0"
-    yt_version = "YT38a"
+    version_code = 4_00_10_00
+    version_name = "4.0.10-0"
+    yt_version = "YT39a"
 
     target_sdk_version = 30
     min_sdk_version = 22
@@ -46,7 +46,8 @@ ext {
 
     libpeercast_version = "4.0.4"
 
-    androidx_version = "1.3.1"
+    androidx_compat_version = "1.3.1"
+    androidx_core_version = "1.5.0"
     leanback_version = "1.1.0-rc01"
 
     lifecycle_version = "2.4.0-alpha03"

diff --git a/common/build.gradle b/common/build.gradle
@@ -45,8 +45,8 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
 
-    implementation "androidx.appcompat:appcompat:$androidx_version"
-    implementation "androidx.core:core-ktx:$androidx_version"
+    implementation "androidx.appcompat:appcompat:$androidx_compat_version"
+    implementation "androidx.core:core-ktx:$androidx_core_version"
     implementation "androidx.preference:preference-ktx:1.1.1"
 
     implementation "com.jakewharton.timber:timber:$timber_version"

diff --git a/core/build.gradle b/core/build.gradle
@@ -80,8 +80,8 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
 
-    implementation "androidx.appcompat:appcompat:$androidx_version"
-    implementation "androidx.core:core-ktx:$androidx_version"
+    implementation "androidx.appcompat:appcompat:$androidx_compat_version"
+    implementation "androidx.core:core-ktx:$androidx_core_version"
 
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"

diff --git a/core/src/main/jni/peercast-yt-android b/core/src/main/jni/peercast-yt-android
diff --git a/tv/build.gradle b/tv/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation "androidx.core:core-ktx:$androidx_version"
+    implementation "androidx.core:core-ktx:$androidx_core_version"
 
     implementation "androidx.leanback:leanback:$leanback_version"
     implementation "androidx.leanback:leanback-preference:$leanback_version"

diff --git a/ui/build.gradle b/ui/build.gradle
@@ -42,8 +42,8 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
 
-    implementation "androidx.appcompat:appcompat:$androidx_version"
-    implementation "androidx.core:core-ktx:$androidx_version"
+    implementation "androidx.appcompat:appcompat:$androidx_compat_version"
+    implementation "androidx.core:core-ktx:$androidx_core_version"
 
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "com.google.android.material:material:1.4.0"
+14 −11		README.md
+63 −68		core/common/chandir.cpp
+1 −1		core/common/chandir.h
+1 −0		core/common/chanhit.cpp
+0 −1		core/common/channel.cpp
+2 −0		core/common/common.cpp
+4 −0		core/common/logbuf.h
+5 −11		core/common/peercast.cpp
+12 −17		core/common/servhs.cpp
+12 −0		core/common/sys.cpp
+3 −3		core/common/version2.h
+2 −1		tests/channelentry_unittest.cpp
+7 −0		ui/catalogs/ja.json
+6 −1		ui/cgi-bin/bbs_reader.py
+14 −17		ui/cgi-bin/board.cgi
+9 −10		ui/html-master/channels.html
+8 −12		ui/html-master/flags.html
+1 −1		ui/html-master/index.html
+4 −2		ui/html-master/peercast.css
+128 −6		ui/html-master/settings.html
+6 −14		ui/linux/main.cpp
+17 −2		ui/mingui/Makefile
+3 −4		ui/mingui/tests/Makefile