mirror of
https://github.com/tateisu/SubwayTooter
synced 2024-12-23 07:38:04 +01:00
targetSdkVersion 30, Gradle 6.6.1, アプリ起動のみ確認済
This commit is contained in:
parent
42b3d3216f
commit
ca21a826ff
@ -9,7 +9,5 @@ dependencies {
|
||||
testImplementation "junit:junit:$junit_version"
|
||||
}
|
||||
|
||||
sourceCompatibility = "1.7"
|
||||
targetCompatibility = "1.7"
|
||||
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
|
@ -4,6 +4,11 @@ apply plugin: 'kotlin-android'
|
||||
android {
|
||||
compileSdkVersion target_sdk_version
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
targetSdkVersion target_sdk_version
|
||||
minSdkVersion min_sdk_version
|
||||
@ -29,8 +34,8 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
testImplementation "junit:junit:$junit_version"
|
||||
androidTestImplementation 'androidx.test:runner:1.3.0-rc03'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc03'
|
||||
androidTestImplementation 'androidx.test:runner:1.3.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||
|
||||
api project(':apng')
|
||||
// 'api' に指定した依存関係はこのライブラリの利用者に公開されます
|
||||
|
@ -14,6 +14,7 @@ android {
|
||||
// Invoke-customs are only supported starting with Android O (--min-api 26)
|
||||
// Default interface methods are only supported starting with Android N (--min-api 24)
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
@ -100,10 +101,10 @@ dependencies {
|
||||
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
||||
|
||||
// DrawerLayout
|
||||
implementation "androidx.drawerlayout:drawerlayout:1.1.0"
|
||||
implementation "androidx.drawerlayout:drawerlayout:1.1.1"
|
||||
|
||||
// NavigationView
|
||||
implementation "com.google.android.material:material:1.2.0"
|
||||
implementation "com.google.android.material:material:1.2.1"
|
||||
|
||||
// PreferenceManager
|
||||
implementation "androidx.preference:preference-ktx:1.1.1"
|
||||
@ -139,12 +140,12 @@ dependencies {
|
||||
|
||||
testImplementation "junit:junit:$junit_version" // しばらくはkotlin-testとjunitを併用
|
||||
|
||||
implementation 'com.squareup.okhttp3:okhttp:4.1.0'
|
||||
implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.1.0'
|
||||
implementation 'com.squareup.okhttp3:okhttp:4.8.1'
|
||||
implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.8.1'
|
||||
testImplementation 'com.squareup.okhttp3:mockwebserver:3.12.1'
|
||||
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.1'
|
||||
|
||||
def glide_version = '4.9.0'
|
||||
def glide_version = '4.11.0'
|
||||
implementation "com.github.bumptech.glide:glide:$glide_version"
|
||||
implementation "com.github.bumptech.glide:annotations:$glide_version"
|
||||
implementation( "com.github.bumptech.glide:okhttp3-integration:$glide_version"){
|
||||
@ -156,7 +157,7 @@ dependencies {
|
||||
kapt "com.github.bumptech.glide:compiler:$glide_version"
|
||||
|
||||
|
||||
implementation "org.conscrypt:conscrypt-android:2.2.1"
|
||||
implementation "org.conscrypt:conscrypt-android:2.5.0"
|
||||
|
||||
implementation 'io.github.inflationx:calligraphy3:3.1.1'
|
||||
implementation 'io.github.inflationx:viewpump:2.0.3'
|
||||
|
@ -24,6 +24,7 @@ class ActHighlightWordEdit
|
||||
CompoundButton.OnCheckedChangeListener {
|
||||
|
||||
companion object {
|
||||
|
||||
internal val log = LogCategory("ActHighlightWordEdit")
|
||||
|
||||
const val EXTRA_ITEM = "item"
|
||||
@ -72,10 +73,16 @@ class ActHighlightWordEdit
|
||||
App1.setActivityTheme(this)
|
||||
initUI()
|
||||
|
||||
item = HighlightWord(
|
||||
(savedInstanceState?.getString(EXTRA_ITEM) ?: intent.getStringExtra(EXTRA_ITEM))
|
||||
.decodeJsonObject()
|
||||
)
|
||||
val src = (savedInstanceState?.getString(EXTRA_ITEM) ?: intent.getStringExtra(EXTRA_ITEM))
|
||||
?.decodeJsonObject()
|
||||
|
||||
if(src == null) {
|
||||
log.d("missing source data")
|
||||
finish()
|
||||
return
|
||||
}
|
||||
|
||||
item = HighlightWord(src)
|
||||
showSampleText()
|
||||
}
|
||||
|
||||
@ -109,8 +116,8 @@ class ActHighlightWordEdit
|
||||
swSpeech = findViewById(R.id.swSpeech)
|
||||
swSpeech.setOnCheckedChangeListener(this)
|
||||
|
||||
App1.setSwitchColor(this,App1.pref,swSound)
|
||||
App1.setSwitchColor(this,App1.pref,swSpeech)
|
||||
App1.setSwitchColor(this, App1.pref, swSound)
|
||||
App1.setSwitchColor(this, App1.pref, swSpeech)
|
||||
|
||||
intArrayOf(
|
||||
R.id.btnTextColorEdit,
|
||||
|
@ -1,7 +1,7 @@
|
||||
buildscript {
|
||||
|
||||
ext.min_sdk_version = 21
|
||||
ext.target_sdk_version = 29
|
||||
ext.target_sdk_version = 30
|
||||
ext.appcompat_version='1.2.0'
|
||||
|
||||
ext.kotlin_version = '1.4.0'
|
||||
|
@ -3,6 +3,11 @@ apply plugin: 'com.android.library'
|
||||
android {
|
||||
compileSdkVersion target_sdk_version
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
targetSdkVersion target_sdk_version
|
||||
minSdkVersion min_sdk_version
|
||||
|
@ -3,6 +3,11 @@ apply plugin: 'com.android.library'
|
||||
android {
|
||||
compileSdkVersion target_sdk_version
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
targetSdkVersion target_sdk_version
|
||||
minSdkVersion min_sdk_version
|
||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
|
||||
|
@ -4,6 +4,11 @@ apply plugin: 'kotlin-android'
|
||||
android {
|
||||
compileSdkVersion target_sdk_version
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
defaultConfig {
|
||||
targetSdkVersion target_sdk_version
|
||||
minSdkVersion min_sdk_version
|
||||
@ -36,8 +41,8 @@ dependencies {
|
||||
|
||||
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
||||
testImplementation "junit:junit:$junit_version"
|
||||
androidTestImplementation 'androidx.test:runner:1.3.0-rc03'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc03'
|
||||
androidTestImplementation 'androidx.test:runner:1.3.0'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
|
||||
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
|
||||
|
Loading…
Reference in New Issue
Block a user