Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

Android Studio 4.0.0, Android gradple plugin 4.0.1, Gradle 6.1.1, kotlin 1.4.0, espresso-core:3.3.0-rc03, androidx.test🏃1.3.0-rc03, androidx.appcompat 1.2.0, androidx.core-ktx 1.3.1, androidx.drawerlayout 1.1.0, androidx.preference 1.1.1, com.google.android.material 1.2.0, firebase-messaging 20.2.4, com.google.android:flexbox 2.0.1, junit 4.13

This commit is contained in:
tateisu 2020-08-23 07:15:27 +09:00
parent be2aeca698
commit ad41d614ec
9 changed files with 29 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.idea/compiler.xml
View File

@ -1,22 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<resourceExtensions /> <bytecodeTargetLevel>
<wildcardResourcePatterns> <module name="apng" target="1.7" />
<entry name="!?*.java" /> </bytecodeTargetLevel>
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component> </component>
</project> </project>

2
apng/build.gradle
View File

@ -6,7 +6,7 @@ dependencies {
//noinspection DifferentStdlibGradleVersion //noinspection DifferentStdlibGradleVersion
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testImplementation group: 'junit', name: 'junit', version: '4.12' testImplementation "junit:junit:$junit_version"
} }
sourceCompatibility = "1.7" sourceCompatibility = "1.7"

6
apng_android/build.gradle
View File

@ -28,9 +28,9 @@ repositories {
} }
dependencies { dependencies {
testImplementation 'junit:junit:4.12' testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02' androidTestImplementation 'androidx.test:runner:1.3.0-rc03'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc03'
api project(':apng') api project(':apng')
// 'api' に指定した依存関係はこのライブラリの利用者に公開されます // 'api' に指定した依存関係はこのライブラリの利用者に公開されます

12
app/build.gradle
View File

@ -99,13 +99,13 @@ dependencies {
implementation "androidx.appcompat:appcompat:$appcompat_version" implementation "androidx.appcompat:appcompat:$appcompat_version"
// DrawerLayout // DrawerLayout
implementation "androidx.drawerlayout:drawerlayout:1.1.0-beta01" implementation "androidx.drawerlayout:drawerlayout:1.1.0"
// NavigationView // NavigationView
implementation "com.google.android.material:material:1.1.0" implementation "com.google.android.material:material:1.2.0"
// PreferenceManager // PreferenceManager
implementation "androidx.preference:preference-ktx:1.1.0" implementation "androidx.preference:preference-ktx:1.1.1"
// CustomTabs // CustomTabs
implementation "androidx.browser:browser:1.2.0" implementation "androidx.browser:browser:1.2.0"
@ -116,7 +116,7 @@ dependencies {
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
implementation "com.google.firebase:firebase-messaging:20.1.5" implementation "com.google.firebase:firebase-messaging:20.2.4"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
@ -134,7 +134,7 @@ dependencies {
//implementation "org.jetbrains.anko:anko-sdk25-coroutines:$anko_version" //implementation "org.jetbrains.anko:anko-sdk25-coroutines:$anko_version"
//implementation "org.jetbrains.anko:anko-appcompat-v7-coroutines:$anko_version" //implementation "org.jetbrains.anko:anko-appcompat-v7-coroutines:$anko_version"
testImplementation 'junit:junit:4.13' // しばらくはkotlin-testとjunitを併用 testImplementation "junit:junit:$junit_version" // しばらくはkotlin-testとjunitを併用
implementation 'com.squareup.okhttp3:okhttp:4.1.0' implementation 'com.squareup.okhttp3:okhttp:4.1.0'
implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.1.0' implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.1.0'
@ -168,7 +168,7 @@ dependencies {
implementation 'org.hjson:hjson:3.0.0' implementation 'org.hjson:hjson:3.0.0'
implementation 'com.google.android:flexbox:1.1.0' // 1.1.0 から AndroidX 依存 implementation 'com.google.android:flexbox:2.0.1' // 1.1.0 から AndroidX 依存
implementation 'com.astuetz:pagerslidingtabstrip:1.0.1' implementation 'com.astuetz:pagerslidingtabstrip:1.0.1'

11
build.gradle
View File

@ -2,12 +2,14 @@ buildscript {
ext.min_sdk_version = 21 ext.min_sdk_version = 21
ext.target_sdk_version = 29 ext.target_sdk_version = 29
ext.appcompat_version='1.1.0' ext.appcompat_version='1.2.0'
ext.kotlin_version = '1.3.71' ext.kotlin_version = '1.4.0'
ext.kotlinx_coroutines_version = '1.3.1' ext.kotlinx_coroutines_version = '1.3.9'
ext.anko_version='0.10.8' ext.anko_version='0.10.8'
ext.junit_version='4.13'
repositories { repositories {
google() google()
jcenter() jcenter()
@ -15,9 +17,10 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.2' classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.google.gms:google-services:4.3.3' classpath 'com.google.gms:google-services:4.3.3'
//noinspection DifferentKotlinGradleVersion
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'de.mobilej.unmock:UnMockPlugin:0.7.3' classpath 'de.mobilej.unmock:UnMockPlugin:0.7.3'

2
colorpicker/build.gradle
View File

@ -19,7 +19,7 @@ android {
dependencies { dependencies {
implementation "androidx.appcompat:appcompat:$appcompat_version" implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation 'com.google.android:flexbox:1.1.0' implementation 'com.google.android:flexbox:2.0.1'
} }

8
exif/build.gradle
View File

@ -34,14 +34,14 @@ unMock {
dependencies { dependencies {
testImplementation 'junit:junit:4.12' testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02' androidTestImplementation 'androidx.test:runner:1.3.0-rc03'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc03'
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'commons-io:commons-io:2.6' implementation 'commons-io:commons-io:2.6'
implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.annotation:annotation:1.1.0'
implementation "androidx.core:core-ktx:1.1.0" implementation "androidx.core:core-ktx:1.3.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
unmock 'org.robolectric:android-all:5.0.0_r2-robolectric-0' unmock 'org.robolectric:android-all:5.0.0_r2-robolectric-0'

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

6
sample_apng/build.gradle
View File

@ -35,9 +35,9 @@ dependencies {
implementation project(':apng_android') implementation project(':apng_android')
implementation "androidx.appcompat:appcompat:$appcompat_version" implementation "androidx.appcompat:appcompat:$appcompat_version"
testImplementation 'junit:junit:4.12' testImplementation "junit:junit:$junit_version"
androidTestImplementation 'androidx.test:runner:1.3.0-alpha02' androidTestImplementation 'androidx.test:runner:1.3.0-rc03'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha02' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc03'
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"