update dependency
This commit is contained in:
parent
dbfdcafca7
commit
2cb9a7ab07
|
@ -29,8 +29,8 @@ repositories {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
androidTestImplementation 'androidx.test:runner:1.3.0-alpha01'
|
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha01'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
|
||||||
|
|
||||||
api project(':apng')
|
api project(':apng')
|
||||||
// 'api' に指定した依存関係はこのライブラリの利用者に公開されます
|
// 'api' に指定した依存関係はこのライブラリの利用者に公開されます
|
||||||
|
|
|
@ -97,12 +97,19 @@ dependencies {
|
||||||
implementation project(':apng_android')
|
implementation project(':apng_android')
|
||||||
|
|
||||||
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
||||||
// implementation "androidx.legacy:legacy-support-v4:$androidx_version"
|
|
||||||
// implementation "androidx.legacy:legacy-support-v13:$androidx_version"
|
// DrawerLayout
|
||||||
implementation "androidx.drawerlayout:drawerlayout:1.1.0-alpha03"
|
implementation "androidx.drawerlayout:drawerlayout:1.1.0-alpha03"
|
||||||
|
|
||||||
|
// NavigationView
|
||||||
|
implementation "com.google.android.material:material:1.1.0-alpha10"
|
||||||
|
|
||||||
|
// PreferenceManager
|
||||||
implementation "androidx.preference:preference-ktx:1.1.0"
|
implementation "androidx.preference:preference-ktx:1.1.0"
|
||||||
implementation "androidx.browser:browser:$androidx_version"
|
|
||||||
implementation "com.google.android.material:material:$androidx_version"
|
// CustomTabs
|
||||||
|
implementation "androidx.browser:browser:1.0.0"
|
||||||
|
|
||||||
kapt 'androidx.annotation:annotation:1.1.0'
|
kapt 'androidx.annotation:annotation:1.1.0'
|
||||||
|
|
||||||
// https://firebase.google.com/support/release-notes/android
|
// https://firebase.google.com/support/release-notes/android
|
||||||
|
|
|
@ -10,7 +10,6 @@ import android.widget.ListView
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
import androidx.core.view.GravityCompat
|
import androidx.core.view.GravityCompat
|
||||||
import androidx.drawerlayout.widget.DrawerLayout
|
import androidx.drawerlayout.widget.DrawerLayout
|
||||||
import com.google.android.material.navigation.NavigationView
|
|
||||||
import jp.juggler.subwaytooter.action.Action_Account
|
import jp.juggler.subwaytooter.action.Action_Account
|
||||||
import jp.juggler.subwaytooter.action.Action_App
|
import jp.juggler.subwaytooter.action.Action_App
|
||||||
import jp.juggler.subwaytooter.table.SavedAccount
|
import jp.juggler.subwaytooter.table.SavedAccount
|
||||||
|
@ -20,7 +19,7 @@ import org.jetbrains.anko.backgroundColor
|
||||||
|
|
||||||
class SideMenuAdapter(
|
class SideMenuAdapter(
|
||||||
val activity : ActMain,
|
val activity : ActMain,
|
||||||
navigationView : NavigationView,
|
navigationView : ViewGroup,
|
||||||
private val drawer : DrawerLayout
|
private val drawer : DrawerLayout
|
||||||
) : BaseAdapter() {
|
) : BaseAdapter() {
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,10 @@ buildscript {
|
||||||
|
|
||||||
ext.min_sdk_version = 21
|
ext.min_sdk_version = 21
|
||||||
ext.target_sdk_version = 29
|
ext.target_sdk_version = 29
|
||||||
ext.androidx_version= '1.0.0'
|
|
||||||
ext.appcompat_version='1.1.0'
|
ext.appcompat_version='1.1.0'
|
||||||
|
|
||||||
ext.kotlin_version = '1.3.50'
|
ext.kotlin_version = '1.3.50'
|
||||||
ext.kotlinx_coroutines_version = '1.3.0'
|
ext.kotlinx_coroutines_version = '1.3.1'
|
||||||
ext.anko_version='0.10.8'
|
ext.anko_version='0.10.8'
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
|
@ -18,10 +17,8 @@ buildscript {
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.5.0'
|
classpath 'com.android.tools.build:gradle:3.5.0'
|
||||||
classpath 'com.google.gms:google-services:4.2.0'
|
classpath 'com.google.gms:google-services:4.2.0'
|
||||||
// com.google.gms:google-services:4.3.0 および 4.3.1 は
|
// com.google.gms:google-services:4.3.0 および 4.3.1 は警告を出す。
|
||||||
// 警告 API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.
|
// API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.
|
||||||
// を出す。
|
|
||||||
|
|
||||||
|
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
// kotlin 1.3.0 を入れるとIDEがindex作成でエラーを繰り返し出すようになるので様子見する
|
// kotlin 1.3.0 を入れるとIDEがindex作成でエラーを繰り返し出すようになるので様子見する
|
||||||
|
|
|
@ -36,8 +36,8 @@ dependencies {
|
||||||
|
|
||||||
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
androidTestImplementation 'androidx.test:runner:1.3.0-alpha01'
|
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02'
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha01'
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02'
|
||||||
|
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
|
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
|
||||||
|
|
Loading…
Reference in New Issue