Skip to content

Commit

Permalink
Merge branch 'release/2023.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
miosakuma committed Apr 5, 2023
2 parents 0795615 + 5b2e1f7 commit 5b2d1fb
Show file tree
Hide file tree
Showing 23 changed files with 288 additions and 279 deletions.
13 changes: 13 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
":timezone(Asia/Tokyo)",
":combinePatchMinorReleases",
":prHourlyLimitNone",
":prConcurrentLimit10",
"group:recommended",
"group:allNonMajor",
"schedule:weekly"
]
}
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'adopt'
distribution: 'temurin'
java-version: '11'
cache: 'gradle'
- name: Copy gradle.properties
Expand Down
35 changes: 32 additions & 3 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,49 @@

## develop

## 2023.1.0

- [UPDATE] システム条件を更新する
- Android Studio 2022.1.1 以降
- WebRTC SFU Sora 2022.2.0 以降
- @miosakuma
- [UPDATE] Kotlin のバージョンを 1.8.10 に上げる
- @miosakuma
- [UPDATE] Gradle を 7.6.1 に上げる
- @miosakuma
- [UPDATE] 依存ライブラリーのバージョンを上げる
- org.jetbrains.dokka:dokka-gradle-plugin を 1.8.10 に上げる
- com.android.tools.build:gradle を 7.4.2 に上げる
- com.github.ben-manes:gradle-versions-plugin を 0.46.0 に上げる
- org.jlleitschuh.gradle:ktlint-gradle を 11.3.1 に上げる
- com.google.code.gson:gson を 2.10.1 に上げる
- androidx.test:core を 1.5.0 に上げる
- org.robolectric:robolectric を 4.9.2 に上げる
- [UPDATE] libwebrtc を 112.5615.1.0 に上げる
- @miosakuma
- [UPDATE] 映像コーデックに `AV1` を追加する
- @miosakuma
- [ADD] `SoraMediaOption``audioStreamingLanguageCode` を追加する
- @miosakuma
- [FIX] テストコード内に廃止された role が残っていたため最新化する
- @miosakuma
- [FIX] `PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY` は Sora がネットワーク変更に対応しておらず不要な設定であるため削除する
- @miosakuma

## 2022.4.0

- [CHANGE] type: offer の mid を必須にする
- [CHANGE] `type: offer``mid` を必須にする
- この修正の結果、 type: offer に mid が含まれない場合は、エラーになります
- @enm10k
- [UPDATE] libwebrtc を 105.5195.0.0 に上げる
- [UPDATE] `libwebrtc` を 105.5195.0.0 に上げる
- @miosakuma
- [UPDATE] `compileSdkVersion` を 32 に上げる
- @miosakuma
- [UPDATE] `targetSdkVersion` を 32 に上げる
- @miosakuma
- [UPDATE] `Kotlin` のバージョンを 1.7.10 に上げる
- @miosakuma
- [UPDATE] Gradle を 7.5.1 に上げる
- [UPDATE] `Gradle` を 7.5.1 に上げる
- @miosakuma
- [UPDATE] 依存ライブラリーのバージョンを上げる
- `com.android.tools.build:gradle` を 7.2.2 に上げる
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Sora Android SDK

[![Release](https://jitpack.io/v/shiguredo/sora-android-sdk.svg)](https://jitpack.io/#shiguredo/sora-android-sdk)
[![libwebrtc](https://img.shields.io/badge/libwebrtc-105.5195-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5195)
[![libwebrtc](https://img.shields.io/badge/libwebrtc-112.5615-blue.svg)](https://chromium.googlesource.com/external/webrtc/+/branch-heads/5615)
[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/shiguredo/sora-android-sdk.svg)](https://github.com/shiguredo/sora-android-sdk.svg)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

Expand All @@ -21,8 +21,8 @@ Please read https://github.com/shiguredo/oss before use.
## システム条件

- Android 5 以降 (エミュレーターでの動作は保証しません)
- Android Studio 2021.2.1 以降
- WebRTC SFU Sora 2022.1.1 以降
- Android Studio 2022.1.1 以降
- WebRTC SFU Sora 2022.2.0 以降

## サンプル

Expand All @@ -39,7 +39,7 @@ Please read https://github.com/shiguredo/oss before use.

```
Copyright 2017, Lyo Kato <lyo.kato at gmail.com> (Original Author)
Copyright 2017-2022, Shiguredo Inc.
Copyright 2017-2023, Shiguredo Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ apply plugin: "org.ajoberstar.grgit"
apply plugin: 'org.jetbrains.dokka'

buildscript {
ext.kotlin_version = '1.7.10'
ext.libwebrtc_version = '105.5195.0.0'
ext.kotlin_version = '1.8.10'
ext.libwebrtc_version = '112.5615.1.0'

ext.dokka_version = '1.7.10'
ext.dokka_version = '1.8.10'

repositories {
google()
Expand All @@ -15,14 +15,14 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:7.4.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
classpath 'org.ajoberstar.grgit:grgit-gradle:5.0.0'

classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
classpath "com.github.ben-manes:gradle-versions-plugin:0.42.0"
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0"
classpath "com.github.ben-manes:gradle-versions-plugin:0.46.0"
classpath "org.jlleitschuh.gradle:ktlint-gradle:11.3.1"
}
}

Expand Down
36 changes: 0 additions & 36 deletions docs/CONTRIBUTING.md

This file was deleted.

68 changes: 0 additions & 68 deletions docs/ISSUE_TEMPLATE.md

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 5b2d1fb

Please sign in to comment.