From b5b6616ef9e0d3ca7c2e4ea9b7aad5a52cf74c23 Mon Sep 17 00:00:00 2001 From: enm10k Date: Wed, 31 Mar 2021 15:40:29 +0900 Subject: [PATCH 1/9] =?UTF-8?q?CHANGES.md=20=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index cb19d90..f5c7140 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,7 +10,7 @@ - バグ修正 -## develop +## 2021.1 ### UPDATE From fa5664f23a23f621396f03da3483fc4665d83a04 Mon Sep 17 00:00:00 2001 From: enm10k Date: Wed, 21 Jul 2021 14:49:53 +0900 Subject: [PATCH 2/9] =?UTF-8?q?permission-dispatcher=20=E3=81=AE=E5=8F=82?= =?UTF-8?q?=E7=85=A7=E5=85=88=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=81=A8=E3=81=93=E3=82=8D=E3=80=81=E4=BB=A5=E4=B8=8B=E3=81=AE?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Execution failed for task ':quickstart:mergeDebugJavaResource'. > A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction > 2 files found with path 'META-INF/metadata.kotlin_module' from inputs: - /Users/enm10k/.gradle/caches/transforms-3/55c3333cf07319e438ea247256d7d05a/transformed/jetified-kotlin-reflect-1.4.31.jar - /Users/enm10k/.gradle/caches/transforms-3/6af37946f1879be45443d86cb56cbb16/transformed/jetified-kotlinx-metadata-jvm-0.0.5.jar Adding a packagingOptions block may help, please refer to https://google.github.io/android-gradle-dsl/current/com.android.build.gradle.internal.dsl.PackagingOptions.html for more information ... --- build.gradle | 6 +++--- quickstart/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0d972b5..c15400c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,12 +5,12 @@ buildscript { ext.sora_android_sdk_version = '2021.1.1' repositories { - jcenter() google() gradlePluginPortal() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:4.2.2' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" @@ -27,9 +27,9 @@ buildscript { allprojects { repositories { - jcenter() google() maven { url 'https://jitpack.io' } + mavenCentral() } } diff --git a/quickstart/build.gradle b/quickstart/build.gradle index 630e861..2e51bc3 100644 --- a/quickstart/build.gradle +++ b/quickstart/build.gradle @@ -48,8 +48,8 @@ dependencies { implementation "androidx.appcompat:appcompat:1.2.0" implementation "com.google.android.material:material:1.3.0" - implementation "org.permissionsdispatcher:permissionsdispatcher:4.8.0" - kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.8.0" + implementation "com.github.permissions-dispatcher:permissionsdispatcher:4.8.0" + kapt "com.github.permissions-dispatcher:permissionsdispatcher-processor:4.8.0" // Sora Android SDK if (findProject(':sora-android-sdk') != null) { From 9e0a57aa7cc2b28f2b0e515a3e628101aa31ce2e Mon Sep 17 00:00:00 2001 From: enm10k Date: Wed, 21 Jul 2021 16:12:10 +0900 Subject: [PATCH 3/9] =?UTF-8?q?permissions-dispatcher=20=E3=81=AE=E3=83=91?= =?UTF-8?q?=E3=82=B9=E3=82=92=E6=9B=B8=E3=81=8D=E6=8F=9B=E3=81=88=E3=81=9F?= =?UTF-8?q?=E3=82=89=E3=83=93=E3=83=AB=E3=83=89=E3=81=8C=E9=80=9A=E3=81=A3?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 6 +++++- quickstart/build.gradle | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6f056dc..04c5c96 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,11 @@ - FIX - バグ修正 +## develop + +- 依存ライブラリーのバージョンを上げる + - `com.android.tools.build:gradle` を 4.2.2 に上げる +- JCenter への参照を取り除く ## sora-andoroid-sdk-2021.1.1 @@ -54,7 +59,6 @@ - `MODE_IN_COMMUNICATION` を使うように変更する - ## 1.8.1 ### UPDATE diff --git a/quickstart/build.gradle b/quickstart/build.gradle index 2e51bc3..7c7033c 100644 --- a/quickstart/build.gradle +++ b/quickstart/build.gradle @@ -48,7 +48,7 @@ dependencies { implementation "androidx.appcompat:appcompat:1.2.0" implementation "com.google.android.material:material:1.3.0" - implementation "com.github.permissions-dispatcher:permissionsdispatcher:4.8.0" + implementation "com.github.permissions-dispatcher.permissionsdispatcher:permissionsdispatcher:4.8.0" kapt "com.github.permissions-dispatcher:permissionsdispatcher-processor:4.8.0" // Sora Android SDK From 6cda2fe2e3b76c6a133351873f98847f409ffa35 Mon Sep 17 00:00:00 2001 From: enm10k Date: Thu, 22 Jul 2021 18:09:54 +0900 Subject: [PATCH 4/9] =?UTF-8?q?permissions-dispatcher=20=E3=82=92=20Maven?= =?UTF-8?q?=20Central=20=E3=81=8B=E3=82=89=E5=8F=96=E5=BE=97=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- quickstart/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c15400c..b91876e 100644 --- a/build.gradle +++ b/build.gradle @@ -28,8 +28,8 @@ buildscript { allprojects { repositories { google() - maven { url 'https://jitpack.io' } mavenCentral() + maven { url 'https://jitpack.io' } } } diff --git a/quickstart/build.gradle b/quickstart/build.gradle index 7c7033c..2e51bc3 100644 --- a/quickstart/build.gradle +++ b/quickstart/build.gradle @@ -48,7 +48,7 @@ dependencies { implementation "androidx.appcompat:appcompat:1.2.0" implementation "com.google.android.material:material:1.3.0" - implementation "com.github.permissions-dispatcher.permissionsdispatcher:permissionsdispatcher:4.8.0" + implementation "com.github.permissions-dispatcher:permissionsdispatcher:4.8.0" kapt "com.github.permissions-dispatcher:permissionsdispatcher-processor:4.8.0" // Sora Android SDK From cd3ec9e5478e0476c92b4003fc029b25c74f05fa Mon Sep 17 00:00:00 2001 From: miosakuma Date: Tue, 27 Jul 2021 11:35:40 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=E3=82=B7=E3=82=B0=E3=83=8A=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=B0=20URL=20=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=20build.gradle=20=E3=81=8B=E3=82=89=20gradle.properties=20?= =?UTF-8?q?=E3=81=AB=E7=A7=BB=E5=8B=95=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 4 ++++ build.gradle | 4 ---- gradle.properties.example | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 04c5c96..18a3dd3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,9 +11,13 @@ ## develop +### UPDATE + - 依存ライブラリーのバージョンを上げる - `com.android.tools.build:gradle` を 4.2.2 に上げる - JCenter への参照を取り除く +- シグナリングエンドポイント URL の設定を `/build.gradle` から `/gradle.properties.example` に移動する + ## sora-andoroid-sdk-2021.1.1 diff --git a/build.gradle b/build.gradle index b91876e..affaa63 100644 --- a/build.gradle +++ b/build.gradle @@ -17,10 +17,6 @@ buildscript { classpath "com.github.ben-manes:gradle-versions-plugin:0.38.0" } - // アプリから参照する設定項目 - ext.signaling_endpoint = "wss://sora.example.com/signaling" - ext.channel_id = "sora" - // デバッグ用: true に設定すると wss ではなく ws で接続できる ext.usesCleartextTraffic = false } diff --git a/gradle.properties.example b/gradle.properties.example index 122fa1c..55ce426 100644 --- a/gradle.properties.example +++ b/gradle.properties.example @@ -19,5 +19,5 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true # Overwrite sora Signaling endpoint in build.gradle's ext.signaling_endpoint -# signaling_endpoint = ws://192.0.2.10:50000/signaling -# channel_id = sora +signaling_endpoint = wss://sora.example.com/signaling +channel_id = sora From 582a8b3ee03f9f6715304ed41997761fe805c8e7 Mon Sep 17 00:00:00 2001 From: miosakuma Date: Tue, 27 Jul 2021 15:54:37 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E6=96=87=E3=81=AE=E8=AA=A4=E3=82=8A=E3=82=92=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties.example b/gradle.properties.example index 55ce426..c9a1365 100644 --- a/gradle.properties.example +++ b/gradle.properties.example @@ -18,6 +18,6 @@ org.gradle.jvmargs=-Xmx1536m android.useAndroidX=true -# Overwrite sora Signaling endpoint in build.gradle's ext.signaling_endpoint +# Setting Sora's signaling endpoint and channel_id signaling_endpoint = wss://sora.example.com/signaling channel_id = sora From f34cd7169c0d1818309ecdf851780490c89efcfd Mon Sep 17 00:00:00 2001 From: miosakuma Date: Thu, 5 Aug 2021 10:19:27 +0900 Subject: [PATCH 7/9] =?UTF-8?q?README.md=20=E3=82=92=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E3=81=AE=E6=83=85=E5=A0=B1=E3=81=AB=E6=9B=B4=E6=96=B0=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 055a05b..8325105 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ Sora Android SDK の使い方は ## システム条件 - Android 5.0 以降 (エミュレーターでの動作は保証しません) -- Android Studio 4.0 以降 -- WebRTC SFU Sora 2020.3 以降 -- Sora Android SDK 2021.1 以降 +- Android Studio 4.2 以降 +- WebRTC SFU Sora 2021.1 以降 +- Sora Android SDK 2021.2 以降 ## 参考リンク @@ -37,4 +37,4 @@ Sora Android SDK の使い方は ## Copyright -Copyright 2017, Shiguredo Inc. and Lyo Kato +Copyright 2021, Shiguredo Inc. and Lyo Kato From db72cc739215df637b6f20aad9487264e00aa633 Mon Sep 17 00:00:00 2001 From: miosakuma Date: Thu, 5 Aug 2021 10:30:05 +0900 Subject: [PATCH 8/9] =?UTF-8?q?CHANGES.md=20=E3=82=92=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=80=82=E8=A8=98=E8=BC=89=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E4=BB=96=E3=81=AE?= =?UTF-8?q?=E3=83=97=E3=83=AD=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88=E3=81=AB?= =?UTF-8?q?=E3=81=82=E3=82=8F=E3=81=9B=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 18a3dd3..eb8c166 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,21 +9,20 @@ - FIX - バグ修正 -## develop +## sora-andoroid-sdk-2021.2 -### UPDATE - -- 依存ライブラリーのバージョンを上げる +- [UPDATE] 依存ライブラリーのバージョンを上げる - `com.android.tools.build:gradle` を 4.2.2 に上げる -- JCenter への参照を取り除く -- シグナリングエンドポイント URL の設定を `/build.gradle` から `/gradle.properties.example` に移動する + - JCenter への参照を取り除く + - @enm10k +- [UPDATE] シグナリングエンドポイント URL の設定を `/build.gradle` から `/gradle.properties.example` に移動する + - @miosakuma ## sora-andoroid-sdk-2021.1.1 -### UPDATE - -- SDK のバージョンを 2021.1.1 に上げる +- [UPDATE] SDK のバージョンを 2021.1.1 に上げる + - @enm10k ## 2021.1 From 652dd2c8a39c2ed6a4193ff04bcf55b308c5e2f4 Mon Sep 17 00:00:00 2001 From: miosakuma Date: Thu, 5 Aug 2021 10:33:56 +0900 Subject: [PATCH 9/9] =?UTF-8?q?SDK=20=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=202021.2=20=E3=81=AB=E4=B8=8A?= =?UTF-8?q?=E3=81=92=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index affaa63..b1edf34 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: "com.github.ben-manes.versions" buildscript { ext.kotlin_version = '1.4.31' - ext.sora_android_sdk_version = '2021.1.1' + ext.sora_android_sdk_version = '2021.2' repositories { google()