From ca21a826fff06c9670f2100e7d82063dae9f56a1 Mon Sep 17 00:00:00 2001 From: tateisu Date: Wed, 9 Sep 2020 05:17:32 +0900 Subject: [PATCH] =?UTF-8?q?targetSdkVersion=2030,=20Gradle=206.6.1,=20?= =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E8=B5=B7=E5=8B=95=E3=81=AE=E3=81=BF?= =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E6=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apng/build.gradle | 6 ++---- apng_android/build.gradle | 9 +++++++-- app/build.gradle | 13 +++++++------ .../subwaytooter/ActHighlightWordEdit.kt | 19 +++++++++++++------ build.gradle | 2 +- colorpicker/build.gradle | 5 +++++ emoji/build.gradle | 5 +++++ gradle/wrapper/gradle-wrapper.properties | 2 +- sample_apng/build.gradle | 9 +++++++-- 9 files changed, 48 insertions(+), 22 deletions(-) diff --git a/apng/build.gradle b/apng/build.gradle index d061bce3..12e85c1d 100644 --- a/apng/build.gradle +++ b/apng/build.gradle @@ -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 diff --git a/apng_android/build.gradle b/apng_android/build.gradle index 04296208..8e8f149a 100644 --- a/apng_android/build.gradle +++ b/apng_android/build.gradle @@ -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' に指定した依存関係はこのライブラリの利用者に公開されます diff --git a/app/build.gradle b/app/build.gradle index b1fafe07..8a923702 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' diff --git a/app/src/main/java/jp/juggler/subwaytooter/ActHighlightWordEdit.kt b/app/src/main/java/jp/juggler/subwaytooter/ActHighlightWordEdit.kt index 1a50c4f0..9803ab8b 100644 --- a/app/src/main/java/jp/juggler/subwaytooter/ActHighlightWordEdit.kt +++ b/app/src/main/java/jp/juggler/subwaytooter/ActHighlightWordEdit.kt @@ -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, diff --git a/build.gradle b/build.gradle index da3d5982..d942df49 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle index 6a501d48..9273f601 100644 --- a/colorpicker/build.gradle +++ b/colorpicker/build.gradle @@ -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 diff --git a/emoji/build.gradle b/emoji/build.gradle index 2d94260b..33321618 100644 --- a/emoji/build.gradle +++ b/emoji/build.gradle @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 63a9d46a..bc64230d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/sample_apng/build.gradle b/sample_apng/build.gradle index d408eeaf..ef7ed5b7 100644 --- a/sample_apng/build.gradle +++ b/sample_apng/build.gradle @@ -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"