diff --git a/app/build.gradle b/app/build.gradle index d2ae856a..d24d6efb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "jp.juggler.subwaytooter" minSdkVersion 21 targetSdkVersion 26 - versionCode 186 - versionName "1.8.6" + versionCode 187 + versionName "1.8.7" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -67,7 +67,6 @@ dependencies { compile 'com.google.firebase:firebase-messaging:11.6.2' testCompile 'junit:junit:4.12' - compile 'commons-io:commons-io:2.4' // 2.6にすると closeQuietly のかわりに try-with-resourceを使えと煩い compile 'uk.co.chrisjenx:calligraphy:2.3.0' compile 'com.github.woxthebox:draglistview:1.5.1' compile 'com.github.omadahealth:swipy:1.2.3@aar' @@ -77,6 +76,9 @@ dependencies { compile 'com.squareup.okhttp3:okhttp:3.9.1' + // commons-io は 2.6にすると closeQuietly のかわりに try-with-resourceを使えと煩い + compile 'commons-io:commons-io:2.4' + // com.github.bumptech.glide 4.x はサポートライブラリ27に依存してる // SDKのソースの27が提供されたら上げる compile 'com.github.bumptech.glide:glide:3.8.0' diff --git a/app/src/main/res/raw/oss_license.txt b/app/src/main/res/raw/oss_license.txt index 4d9d6a28..17ede310 100644 --- a/app/src/main/res/raw/oss_license.txt +++ b/app/src/main/res/raw/oss_license.txt @@ -288,3 +288,19 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +==================================================== +google/ExoPlayer +https://github.com/google/ExoPlayer + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License.