diff --git a/annotation/build.gradle b/annotation/build.gradle index 1919ee8c..80169d13 100644 --- a/annotation/build.gradle +++ b/annotation/build.gradle @@ -5,12 +5,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.annotation" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName rikka_annotation_version + consumerProguardFiles 'consumer-rules.pro' } buildTypes { diff --git a/annotation/src/main/AndroidManifest.xml b/annotation/src/main/AndroidManifest.xml index 71bf275d..227314ee 100644 --- a/annotation/src/main/AndroidManifest.xml +++ b/annotation/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/appcompat/build.gradle b/appcompat/build.gradle index 66be2fae..744a5a43 100644 --- a/appcompat/build.gradle +++ b/appcompat/build.gradle @@ -7,17 +7,19 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "androidx.appcompat" + compileSdk target_sdk + defaultConfig { - minSdkVersion 23 - targetSdkVersion target_sdk + minSdk 23 + targetSdk target_sdk versionCode 1 versionName '1.6.1' consumerProguardFiles 'consumer-rules.pro' } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { // This disables the builds tools automatic vector -> PNG generation @@ -36,25 +38,23 @@ android { } dependencies { - api("androidx.annotation:annotation:1.3.0") - api("androidx.core:core:1.9.0") + api("androidx.annotation:annotation:$androidx_annotation_version") + api("androidx.core:core:$androidx_core_version") // Required to make activity 1.5.0-rc01 dependencies resolve. - implementation("androidx.core:core-ktx:1.8.0") - implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.0") - implementation("androidx.emoji2:emoji2:1.2.0") - implementation("androidx.emoji2:emoji2-views-helper:1.2.0") - implementation("androidx.collection:collection:1.0.0") + implementation("androidx.core:core-ktx:$androidx_core_version") + implementation("androidx.emoji2:emoji2:1.5.0") + implementation("androidx.emoji2:emoji2-views-helper:1.5.0") + implementation("androidx.collection:collection:1.4.4") api("androidx.cursoradapter:cursoradapter:1.0.0") - api("androidx.activity:activity:1.6.0") - api("androidx.fragment:fragment:1.3.6") - api("androidx.appcompat:appcompat-resources:1.6.1") - api("androidx.drawerlayout:drawerlayout:1.0.0") - implementation("androidx.lifecycle:lifecycle-runtime:2.5.1") - implementation("androidx.lifecycle:lifecycle-viewmodel:2.5.1") + api("androidx.activity:activity:$androidx_activity_version") + api("androidx.fragment:fragment:$androidx_fragment_version") + api("androidx.appcompat:appcompat-resources:$androidx_appcompat_version") + api("androidx.drawerlayout:drawerlayout:1.2.0") + implementation("androidx.lifecycle:lifecycle-runtime:$androidx_lifecycle_version") + implementation("androidx.lifecycle:lifecycle-viewmodel:$androidx_lifecycle_version") implementation("androidx.resourceinspection:resourceinspection-annotation:1.0.1") - api("androidx.savedstate:savedstate:1.2.0") + api("androidx.savedstate:savedstate:1.2.1") // Due to experimental annotations used in core. - compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.8.0") kapt("androidx.resourceinspection:resourceinspection-annotation:1.0.1") } diff --git a/appcompat/src/main/AndroidManifest.xml b/appcompat/src/main/AndroidManifest.xml index 203901b5..2766785a 100644 --- a/appcompat/src/main/AndroidManifest.xml +++ b/appcompat/src/main/AndroidManifest.xml @@ -13,4 +13,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/build.gradle b/build.gradle index e05535d1..5aa70ca8 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,8 @@ buildscript { } plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.7.0' apply false + id 'com.android.library' version '8.7.0' apply false id 'org.jetbrains.kotlin.jvm' version '2.0.20' apply false } @@ -103,7 +103,3 @@ subprojects { } } } - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/buildcompat/build.gradle b/buildcompat/build.gradle index 7e32edb8..be7a4150 100644 --- a/buildcompat/build.gradle +++ b/buildcompat/build.gradle @@ -5,14 +5,14 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.buildcompat" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '34.0.1' - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildFeatures { buildConfig false @@ -24,17 +24,13 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } dependencies { implementation "androidx.annotation:annotation:$androidx_annotation_version" - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } ext { diff --git a/buildcompat/src/main/AndroidManifest.xml b/buildcompat/src/main/AndroidManifest.xml index 0f2e5bb5..cc947c56 100644 --- a/buildcompat/src/main/AndroidManifest.xml +++ b/buildcompat/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/compatibility/build.gradle b/compatibility/build.gradle index d6ad2126..cf75a0b8 100644 --- a/compatibility/build.gradle +++ b/compatibility/build.gradle @@ -5,14 +5,14 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.compatibility" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '2.0.0' - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildFeatures { buildConfig false @@ -24,8 +24,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } @@ -33,10 +33,6 @@ dependencies { implementation "androidx.annotation:annotation:$androidx_annotation_version" compileOnly project(':stub') implementation project(':lazy') - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } ext { diff --git a/compatibility/src/main/AndroidManifest.xml b/compatibility/src/main/AndroidManifest.xml index dc6205d6..cc947c56 100644 --- a/compatibility/src/main/AndroidManifest.xml +++ b/compatibility/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/core/core-ktx/build.gradle b/core/core-ktx/build.gradle index c47f06c6..436b12c8 100644 --- a/core/core-ktx/build.gradle +++ b/core/core-ktx/build.gradle @@ -6,12 +6,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.core.ktx" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName rikka_core_version + consumerProguardFiles 'consumer-rules.pro' } buildTypes { @@ -21,8 +24,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/core/core-ktx/src/main/AndroidManifest.xml b/core/core-ktx/src/main/AndroidManifest.xml index ea35c52d..cc947c56 100644 --- a/core/core-ktx/src/main/AndroidManifest.xml +++ b/core/core-ktx/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/core/core/build.gradle b/core/core/build.gradle index 205341f6..50bc0b2d 100644 --- a/core/core/build.gradle +++ b/core/core/build.gradle @@ -5,12 +5,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.core" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName rikka_core_version + consumerProguardFiles 'consumer-rules.pro' } buildTypes { @@ -20,8 +23,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/core/core/src/main/AndroidManifest.xml b/core/core/src/main/AndroidManifest.xml index cc267fb6..cc947c56 100644 --- a/core/core/src/main/AndroidManifest.xml +++ b/core/core/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c352119..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 13da4cfe..df97d72b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,7 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/html/html-ktx/build.gradle b/html/html-ktx/build.gradle index 4290b3ff..9037427c 100644 --- a/html/html-ktx/build.gradle +++ b/html/html-ktx/build.gradle @@ -6,14 +6,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.html.ktx" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName rikka_html_version - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } buildFeatures { @@ -26,8 +27,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/html/html-ktx/src/main/AndroidManifest.xml b/html/html-ktx/src/main/AndroidManifest.xml index ed633666..cc947c56 100644 --- a/html/html-ktx/src/main/AndroidManifest.xml +++ b/html/html-ktx/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/html/html/build.gradle b/html/html/build.gradle index fa05d9c0..fdf63a49 100644 --- a/html/html/build.gradle +++ b/html/html/build.gradle @@ -5,14 +5,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.html" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName rikka_html_version - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } buildFeatures { @@ -25,18 +26,14 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } dependencies { implementation "org.ccil.cowan.tagsoup:tagsoup:1.2" implementation "androidx.annotation:annotation:$androidx_annotation_version" - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' } ext { diff --git a/html/html/src/main/AndroidManifest.xml b/html/html/src/main/AndroidManifest.xml index bd1ef6b1..cc947c56 100644 --- a/html/html/src/main/AndroidManifest.xml +++ b/html/html/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/insets/build.gradle b/insets/build.gradle index bf2ab070..742fdbde 100644 --- a/insets/build.gradle +++ b/insets/build.gradle @@ -6,12 +6,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.insets" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName '1.3.0' + consumerProguardFiles 'consumer-rules.pro' } buildTypes { @@ -21,8 +24,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/insets/src/main/AndroidManifest.xml b/insets/src/main/AndroidManifest.xml index 2b6bceb7..cc947c56 100644 --- a/insets/src/main/AndroidManifest.xml +++ b/insets/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/io/little-endian-data-stream/build.gradle b/io/little-endian-data-stream/build.gradle index d862c07a..af5028d2 100644 --- a/io/little-endian-data-stream/build.gradle +++ b/io/little-endian-data-stream/build.gradle @@ -5,14 +5,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.io.stream.le" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '1.0.2' - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } buildFeatures { @@ -25,17 +26,13 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } dependencies { implementation "androidx.annotation:annotation:$androidx_annotation_version" - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } ext { diff --git a/io/little-endian-data-stream/src/main/AndroidManifest.xml b/io/little-endian-data-stream/src/main/AndroidManifest.xml index 348fcdc1..cc947c56 100644 --- a/io/little-endian-data-stream/src/main/AndroidManifest.xml +++ b/io/little-endian-data-stream/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/layoutinflater/build.gradle b/layoutinflater/build.gradle index 44d9a4d8..769c3dc7 100644 --- a/layoutinflater/build.gradle +++ b/layoutinflater/build.gradle @@ -5,16 +5,18 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.layoutinflater" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName '1.3.0' } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/layoutinflater/src/main/AndroidManifest.xml b/layoutinflater/src/main/AndroidManifest.xml index afb245ab..cc947c56 100644 --- a/layoutinflater/src/main/AndroidManifest.xml +++ b/layoutinflater/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/lazy/build.gradle b/lazy/build.gradle index e18c85b2..6a7f2426 100644 --- a/lazy/build.gradle +++ b/lazy/build.gradle @@ -5,14 +5,14 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.lazy" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '2.0.1' - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildFeatures { buildConfig false @@ -24,17 +24,13 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } dependencies { implementation "androidx.annotation:annotation:$androidx_annotation_version" - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } ext { diff --git a/lazy/src/main/AndroidManifest.xml b/lazy/src/main/AndroidManifest.xml index 4c54a212..cc947c56 100644 --- a/lazy/src/main/AndroidManifest.xml +++ b/lazy/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/lifecycle/lifecycle-resource-livedata/build.gradle b/lifecycle/lifecycle-resource-livedata/build.gradle index dd406f53..c918ba51 100644 --- a/lifecycle/lifecycle-resource-livedata/build.gradle +++ b/lifecycle/lifecycle-resource-livedata/build.gradle @@ -6,12 +6,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.lifecycle.resource.livedata" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '1.0.1' + consumerProguardFiles 'consumer-rules.pro' } buildFeatures { @@ -24,19 +27,17 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - compileOnly 'androidx.activity:activity-ktx:1.2.3' - compileOnly 'androidx.fragment:fragment-ktx:1.3.4' - - def lifecycle_version = "2.3.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + compileOnly "androidx.activity:activity-ktx:$androidx_activity_version" + compileOnly "androidx.fragment:fragment-ktx:$androidx_fragment_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidx_lifecycle_version" } ext { diff --git a/lifecycle/lifecycle-resource-livedata/src/main/AndroidManifest.xml b/lifecycle/lifecycle-resource-livedata/src/main/AndroidManifest.xml index b8d3cbdb..cc947c56 100644 --- a/lifecycle/lifecycle-resource-livedata/src/main/AndroidManifest.xml +++ b/lifecycle/lifecycle-resource-livedata/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/lifecycle/lifecycle-shared-viewmodel/build.gradle b/lifecycle/lifecycle-shared-viewmodel/build.gradle index 3fd117fd..14313ab3 100644 --- a/lifecycle/lifecycle-shared-viewmodel/build.gradle +++ b/lifecycle/lifecycle-shared-viewmodel/build.gradle @@ -6,12 +6,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.lifecycle.shared.viewmodel" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '1.0.1' + consumerProguardFiles 'consumer-rules.pro' } buildFeatures { @@ -24,19 +27,17 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - compileOnly 'androidx.activity:activity-ktx:1.2.3' - compileOnly 'androidx.fragment:fragment-ktx:1.3.4' - - def lifecycle_version = "2.3.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + compileOnly "androidx.activity:activity-ktx:$androidx_activity_version" + compileOnly "androidx.fragment:fragment-ktx:$androidx_fragment_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidx_lifecycle_version" } ext { diff --git a/lifecycle/lifecycle-shared-viewmodel/src/main/AndroidManifest.xml b/lifecycle/lifecycle-shared-viewmodel/src/main/AndroidManifest.xml index edd2f83a..cc947c56 100644 --- a/lifecycle/lifecycle-shared-viewmodel/src/main/AndroidManifest.xml +++ b/lifecycle/lifecycle-shared-viewmodel/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/lifecycle/lifecycle-shared-viewmodel/src/main/java/androidx/lifecycle/rikkax_lifecycle_ViewModel.java b/lifecycle/lifecycle-shared-viewmodel/src/main/java/androidx/lifecycle/rikkax_lifecycle_ViewModel.java index ef16e6ea..54dffba3 100644 --- a/lifecycle/lifecycle-shared-viewmodel/src/main/java/androidx/lifecycle/rikkax_lifecycle_ViewModel.java +++ b/lifecycle/lifecycle-shared-viewmodel/src/main/java/androidx/lifecycle/rikkax_lifecycle_ViewModel.java @@ -3,6 +3,6 @@ public class rikkax_lifecycle_ViewModel { public static void clear(ViewModel viewModel) { - viewModel.clear(); + viewModel.clear$lifecycle_viewmodel_release(); } } diff --git a/lifecycle/lifecycle-viewmodel-lazy/build.gradle b/lifecycle/lifecycle-viewmodel-lazy/build.gradle index 0b4ef43b..fe336224 100644 --- a/lifecycle/lifecycle-viewmodel-lazy/build.gradle +++ b/lifecycle/lifecycle-viewmodel-lazy/build.gradle @@ -6,12 +6,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.lifecycle.viewmodel.lazy" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '2.0.0' + consumerProguardFiles 'consumer-rules.pro' } buildFeatures { @@ -24,19 +27,17 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - compileOnly 'androidx.activity:activity-ktx:1.2.3' - compileOnly 'androidx.fragment:fragment-ktx:1.3.4' - - def lifecycle_version = "2.3.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + compileOnly "androidx.activity:activity-ktx:$androidx_activity_version" + compileOnly "androidx.fragment:fragment-ktx:$androidx_fragment_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidx_lifecycle_version" } ext { diff --git a/lifecycle/lifecycle-viewmodel-lazy/src/main/AndroidManifest.xml b/lifecycle/lifecycle-viewmodel-lazy/src/main/AndroidManifest.xml index 1ddd188a..cc947c56 100644 --- a/lifecycle/lifecycle-viewmodel-lazy/src/main/AndroidManifest.xml +++ b/lifecycle/lifecycle-viewmodel-lazy/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/lifecycle/lifecycle-viewmodel-lazy/src/main/java/rikka/lifecycle/ViewModelLazy.kt b/lifecycle/lifecycle-viewmodel-lazy/src/main/java/rikka/lifecycle/ViewModelLazy.kt index cf038117..094a99dd 100644 --- a/lifecycle/lifecycle-viewmodel-lazy/src/main/java/rikka/lifecycle/ViewModelLazy.kt +++ b/lifecycle/lifecycle-viewmodel-lazy/src/main/java/rikka/lifecycle/ViewModelLazy.kt @@ -45,11 +45,10 @@ class ViewModelLazy( return (if (viewModel == null) { val store = storeProducer() ViewModelProvider(store, object : ViewModelProvider.Factory { - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return viewModelProducer() as T } - - }).get(clazz).also { + })[clazz].also { cached = it as VM } } else { diff --git a/manifest.gradle b/manifest.gradle index 17673e08..cb7777c6 100644 --- a/manifest.gradle +++ b/manifest.gradle @@ -1,17 +1,23 @@ ext { - kotlin_coroutines_version = '1.5.1' + kotlin_coroutines_version = '1.9.0' target_sdk = 33 - androidx_annotation_version = "1.4.0" - androidx_annotation_experimental_version = "1.0.0" - androidx_appcompat_version = "1.4.1" - androidx_core_version = "1.8.0" - androidx_fragment_version = "1.2.5" + androidx_annotation_version = "1.8.2" + androidx_annotation_experimental_version = "1.4.1" + androidx_appcompat_version = "1.7.0" + androidx_core_version = "1.13.1" + androidx_activity_version = "1.9.2" + androidx_fragment_version = "1.8.4" + androidx_lifecycle_version = "2.8.6" androidx_interpolator_version = "1.0.0" - androidx_recyclerview_version = "1.1.0" + androidx_recyclerview_version = "1.3.2" androidx_swiperefreshlayout_version = "1.1.0" - androidx_preference_version = "1.2.0" + androidx_preference_version = "1.2.1" + + google_material_version = "1.13.0-alpha06" + zhanghai_fastscroll_version = "1.3.0" + zhanghai_appiconloader_version = "1.5.0" rikka_annotation_version = "1.0.0" rikka_core_version = "1.4.1" diff --git a/material/material-chooser/build.gradle b/material/material-chooser/build.gradle index 03325498..cf0218f8 100644 --- a/material/material-chooser/build.gradle +++ b/material/material-chooser/build.gradle @@ -6,14 +6,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.material.chooser" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName '2.0.0' - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } buildTypes { @@ -23,8 +24,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } @@ -35,17 +36,13 @@ dependencies { implementation "androidx.core:core-ktx:$androidx_core_version" implementation "androidx.fragment:fragment-ktx:$androidx_fragment_version" implementation "androidx.recyclerview:recyclerview:$androidx_recyclerview_version" - implementation 'me.zhanghai.android.appiconloader:appiconloader:1.3.1' + implementation "me.zhanghai.android.appiconloader:appiconloader:$zhanghai_appiconloader_version" implementation(project(":appcompat")) implementation(project(":core:core")) implementation(project(":material:material")) implementation(project(":recyclerview:recyclerview-adapter")) implementation(project(":recyclerview:recyclerview-ktx")) - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' } ext { diff --git a/material/material-chooser/src/main/AndroidManifest.xml b/material/material-chooser/src/main/AndroidManifest.xml index a82b3ed3..94d1c83d 100644 --- a/material/material-chooser/src/main/AndroidManifest.xml +++ b/material/material-chooser/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + diff --git a/material/material-help/build.gradle b/material/material-help/build.gradle index 3409486d..749022d5 100644 --- a/material/material-help/build.gradle +++ b/material/material-help/build.gradle @@ -5,14 +5,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.material.help" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName '1.2.0' - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } buildTypes { @@ -24,7 +25,7 @@ android { } dependencies { - implementation "androidx.fragment:fragment:1.1.0" + implementation "androidx.fragment:fragment:$androidx_fragment_version" implementation "androidx.recyclerview:recyclerview:$androidx_recyclerview_version" implementation "androidx.preference:preference:$androidx_preference_version" diff --git a/material/material-help/src/main/AndroidManifest.xml b/material/material-help/src/main/AndroidManifest.xml index e33994e2..cc947c56 100644 --- a/material/material-help/src/main/AndroidManifest.xml +++ b/material/material-help/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/material/material-help/src/main/java/rikka/material/help/HelpFragment.java b/material/material-help/src/main/java/rikka/material/help/HelpFragment.java index 61dc6252..a685da00 100644 --- a/material/material-help/src/main/java/rikka/material/help/HelpFragment.java +++ b/material/material-help/src/main/java/rikka/material/help/HelpFragment.java @@ -48,7 +48,7 @@ public void addPreference(String categoryKey, @StringRes int title, @StringRes i * Add a preference to specified preference group. */ public void addPreference(String categoryKey, CharSequence title, CharSequence summary, Drawable icon, Intent intent, Preference.OnPreferenceClickListener listener) { - Preference preference = new Preference(requireContext(), null, R.attr.preferenceStyle, R.style.Preference_Help); + Preference preference = new Preference(requireContext(), null, androidx.preference.R.attr.preferenceStyle, R.style.Preference_Help); preference.setTitle(title); preference.setSummary(summary); preference.setIcon(icon); diff --git a/material/material-preference/build.gradle b/material/material-preference/build.gradle index 68971d04..950ff92c 100644 --- a/material/material-preference/build.gradle +++ b/material/material-preference/build.gradle @@ -5,14 +5,14 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.material.preference" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName '2.0.0' - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { @@ -24,7 +24,7 @@ android { dependencies { implementation "androidx.preference:preference:$androidx_preference_version" - api 'com.google.android.material:material:1.7.0-alpha02' + api "com.google.android.material:material:$google_material_version" api project(':material:material') api project(':preference:simplemenu-preference') api project(':layoutinflater') diff --git a/material/material-preference/src/main/AndroidManifest.xml b/material/material-preference/src/main/AndroidManifest.xml index b1e03bc8..cc947c56 100644 --- a/material/material-preference/src/main/AndroidManifest.xml +++ b/material/material-preference/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/material/material/build.gradle b/material/material/build.gradle index b3a025bd..505f4400 100644 --- a/material/material/build.gradle +++ b/material/material/build.gradle @@ -7,14 +7,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.material" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName '2.7.1' - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } buildTypes { @@ -24,8 +25,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } @@ -68,7 +69,7 @@ dependencies { implementation "androidx.core:core-ktx:$androidx_core_version" api "androidx.recyclerview:recyclerview:$androidx_recyclerview_version" api "androidx.swiperefreshlayout:swiperefreshlayout:$androidx_swiperefreshlayout_version" - api 'com.google.android.material:material:1.7.0' + api "com.google.android.material:material:$google_material_version" /*api "rikka.appcompat:appcompat:$rikka_appcompat_version" implementation "rikka.core:core:$rikka_core_version"*/ @@ -78,10 +79,6 @@ dependencies { api(project(":layoutinflater")) api(project(":insets")) implementation(project(":widget:switchbar")) - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.4.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } ext { diff --git a/material/material/src/androidTest/java/rikka/material/ExampleInstrumentedTest.java b/material/material/src/androidTest/java/rikka/material/ExampleInstrumentedTest.java deleted file mode 100644 index 74519a86..00000000 --- a/material/material/src/androidTest/java/rikka/material/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package rikka.material; - -import android.content.Context; - -import androidx.test.InstrumentationRegistry; -import androidx.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("moe.shizuku.liveevent.test", appContext.getPackageName()); - } -} diff --git a/material/material/src/main/AndroidManifest.xml b/material/material/src/main/AndroidManifest.xml index 086d565d..cc947c56 100644 --- a/material/material/src/main/AndroidManifest.xml +++ b/material/material/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/material/material/src/main/java/rikka/material/app/MaterialActivity.kt b/material/material/src/main/java/rikka/material/app/MaterialActivity.kt index e2674e73..cb7c7312 100644 --- a/material/material/src/main/java/rikka/material/app/MaterialActivity.kt +++ b/material/material/src/main/java/rikka/material/app/MaterialActivity.kt @@ -56,7 +56,7 @@ open class MaterialActivity : ThemedAppCompatActivity(), TranslucentSystemBars { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { window?.decorView?.post { - if (window.decorView.rootWindowInsets?.systemWindowInsetBottom ?: 0 >= Resources.getSystem().displayMetrics.density * 40) { + if ((window.decorView.rootWindowInsets?.systemWindowInsetBottom ?: 0) >= Resources.getSystem().displayMetrics.density * 40) { window.navigationBarDividerColor = theme.resolveColor(R.attr.navigationBarDividerColor) } } diff --git a/material/material/src/test/java/rikka/material/ExampleUnitTest.java b/material/material/src/test/java/rikka/material/ExampleUnitTest.java deleted file mode 100644 index 340430db..00000000 --- a/material/material/src/test/java/rikka/material/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package rikka.material; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/parcelablelist/build.gradle b/parcelablelist/build.gradle index 344ee149..6d87eabd 100644 --- a/parcelablelist/build.gradle +++ b/parcelablelist/build.gradle @@ -5,10 +5,12 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.parcelablelist" + compileSdk target_sdk + defaultConfig { - minSdkVersion 16 - targetSdkVersion target_sdk + minSdk 16 + targetSdk target_sdk versionCode 1 versionName '2.0.1' consumerProguardFiles 'consumer-rules.pro' @@ -21,8 +23,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/parcelablelist/src/main/AndroidManifest.xml b/parcelablelist/src/main/AndroidManifest.xml index 953da3a5..cc947c56 100644 --- a/parcelablelist/src/main/AndroidManifest.xml +++ b/parcelablelist/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/preference/multiprocess/build.gradle b/preference/multiprocess/build.gradle index 7fdc8dc7..3af2323e 100644 --- a/preference/multiprocess/build.gradle +++ b/preference/multiprocess/build.gradle @@ -5,16 +5,17 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.preference.multiprocess" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName rikka_preference_multiprocess_version - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' - aidlPackageWhiteList 'rikka/preference/IMultiProcessPreferenceChangeListener.aidl' + aidlPackagedList 'rikka/preference/IMultiProcessPreferenceChangeListener.aidl' } buildTypes { release { @@ -23,18 +24,17 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 + } + buildFeatures { + aidl = true } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.annotation:annotation:$androidx_annotation_version" - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' } ext { diff --git a/preference/multiprocess/src/androidTest/java/rikka/preference/ExampleInstrumentedTest.java b/preference/multiprocess/src/androidTest/java/rikka/preference/ExampleInstrumentedTest.java deleted file mode 100644 index fb9aac0e..00000000 --- a/preference/multiprocess/src/androidTest/java/rikka/preference/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package rikka.preference; - -import android.content.Context; - -import androidx.test.InstrumentationRegistry; -import androidx.test.runner.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.assertEquals; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); - - assertEquals("moe.shizuku.liveevent.test", appContext.getPackageName()); - } -} diff --git a/preference/multiprocess/src/main/AndroidManifest.xml b/preference/multiprocess/src/main/AndroidManifest.xml index 74831a35..cc947c56 100644 --- a/preference/multiprocess/src/main/AndroidManifest.xml +++ b/preference/multiprocess/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/preference/multiprocess/src/test/java/rikka/preference/ExampleUnitTest.java b/preference/multiprocess/src/test/java/rikka/preference/ExampleUnitTest.java deleted file mode 100644 index cf60b683..00000000 --- a/preference/multiprocess/src/test/java/rikka/preference/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package rikka.preference; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/preference/simplemenu-preference/build.gradle b/preference/simplemenu-preference/build.gradle index 54ef4fc9..9e0eb22b 100644 --- a/preference/simplemenu-preference/build.gradle +++ b/preference/simplemenu-preference/build.gradle @@ -5,10 +5,12 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.preference.simplemenu" + compileSdk target_sdk + defaultConfig { - minSdkVersion 16 - targetSdkVersion target_sdk + minSdk 16 + targetSdk target_sdk versionCode 1 versionName '1.0.3' consumerProguardFiles 'consumer-rules.pro' @@ -23,8 +25,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/preference/simplemenu-preference/src/main/AndroidManifest.xml b/preference/simplemenu-preference/src/main/AndroidManifest.xml index bfd4f7bb..227314ee 100644 --- a/preference/simplemenu-preference/src/main/AndroidManifest.xml +++ b/preference/simplemenu-preference/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/recyclerview/recyclerview-adapter/build.gradle b/recyclerview/recyclerview-adapter/build.gradle index d07b8c07..b2a40098 100644 --- a/recyclerview/recyclerview-adapter/build.gradle +++ b/recyclerview/recyclerview-adapter/build.gradle @@ -5,10 +5,12 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.recyclerview.adapter" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '1.3.0' @@ -29,10 +31,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.recyclerview:recyclerview:$androidx_recyclerview_version" - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' } ext { diff --git a/recyclerview/recyclerview-adapter/src/main/AndroidManifest.xml b/recyclerview/recyclerview-adapter/src/main/AndroidManifest.xml index 80e584d8..227314ee 100644 --- a/recyclerview/recyclerview-adapter/src/main/AndroidManifest.xml +++ b/recyclerview/recyclerview-adapter/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/recyclerview/recyclerview-ktx/build.gradle b/recyclerview/recyclerview-ktx/build.gradle index b84626d6..2567e786 100644 --- a/recyclerview/recyclerview-ktx/build.gradle +++ b/recyclerview/recyclerview-ktx/build.gradle @@ -6,14 +6,15 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.recyclerview.ktx" + compileSdk target_sdk + defaultConfig { - minSdkVersion 14 - targetSdkVersion target_sdk + minSdk 14 + targetSdk target_sdk versionCode 1 versionName '1.3.2' - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' } /*buildFeatures { @@ -30,11 +31,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.recyclerview:recyclerview:$androidx_recyclerview_version" - implementation 'me.zhanghai.android.fastscroll:library:1.2.0' - - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation "me.zhanghai.android.fastscroll:library:$zhanghai_fastscroll_version" } ext { diff --git a/recyclerview/recyclerview-ktx/src/main/AndroidManifest.xml b/recyclerview/recyclerview-ktx/src/main/AndroidManifest.xml index a111ec91..227314ee 100644 --- a/recyclerview/recyclerview-ktx/src/main/AndroidManifest.xml +++ b/recyclerview/recyclerview-ktx/src/main/AndroidManifest.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/recyclerview/recyclerview-ktx/src/main/java/rikka/recyclerview/RecyclerView.kt b/recyclerview/recyclerview-ktx/src/main/java/rikka/recyclerview/RecyclerView.kt index c5771c53..7381051f 100644 --- a/recyclerview/recyclerview-ktx/src/main/java/rikka/recyclerview/RecyclerView.kt +++ b/recyclerview/recyclerview-ktx/src/main/java/rikka/recyclerview/RecyclerView.kt @@ -58,14 +58,19 @@ class ItemSpacing( private val top: Int = 0, private val right: Int = 0, private val bottom: Int = 0, -) : RecyclerView.ItemDecoration() { +) : ItemDecoration() { var allowLeft: Boolean = true var allowTop: Boolean = true var allowRight: Boolean = true var allowBottom: Boolean = true - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { + override fun getItemOffsets( + outRect: Rect, + view: View, + parent: RecyclerView, + state: RecyclerView.State + ) { if (parent.adapter == null) { return } @@ -116,19 +121,24 @@ fun RecyclerView.addEdgeSpacing( ).also { addItemDecoration(it) } } -class EdgeSpacing constructor( +class EdgeSpacing( private val left: Int = 0, private val top: Int = 0, private val right: Int = 0, private val bottom: Int = 0 -) : RecyclerView.ItemDecoration() { +) : ItemDecoration() { var allowLeft: Boolean = true var allowTop: Boolean = true var allowRight: Boolean = true var allowBottom: Boolean = true - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { + override fun getItemOffsets( + outRect: Rect, + view: View, + parent: RecyclerView, + state: RecyclerView.State + ) { val adapter = parent.adapter ?: return val position = parent.getChildLayoutPosition(view) @@ -171,7 +181,7 @@ fun RecyclerView.addVerticalPadding(paddingTopDp: Int = 8, paddingBottomDp: Int addItemDecoration(VerticalPaddingDecoration(context, paddingTopDp, paddingBottomDp)) } -private class VerticalPaddingDecoration constructor( +private class VerticalPaddingDecoration( context: Context, paddingTop: Int = 8, paddingBottom: Int = 8 @@ -182,7 +192,12 @@ private class VerticalPaddingDecoration constructor( private var allowTop: Boolean = true private var allowBottom: Boolean = true - override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { + override fun getItemOffsets( + outRect: Rect, + view: View, + parent: RecyclerView, + state: RecyclerView.State + ) { if (parent.adapter == null) { return } @@ -196,7 +211,10 @@ private class VerticalPaddingDecoration constructor( } } -fun RecyclerView.fixEdgeEffect(overScrollIfContentScrolls: Boolean = true, alwaysClipToPadding: Boolean = true) { +fun RecyclerView.fixEdgeEffect( + overScrollIfContentScrolls: Boolean = true, + alwaysClipToPadding: Boolean = true +) { if (overScrollIfContentScrolls) { val listener = OverScrollIfContentScrollsListener() addOnLayoutChangeListener(listener) @@ -236,9 +254,9 @@ private class OverScrollIfContentScrollsListener : View.OnLayoutChangeListener { if (shouldDrawOverScroll(v as RecyclerView) != show) { show = !show if (show) { - v.setOverScrollMode(View.OVER_SCROLL_IF_CONTENT_SCROLLS) + v.overScrollMode = View.OVER_SCROLL_IF_CONTENT_SCROLLS } else { - v.setOverScrollMode(View.OVER_SCROLL_NEVER) + v.overScrollMode = View.OVER_SCROLL_NEVER } } } @@ -330,11 +348,13 @@ fun RecyclerView.addFastScroller(parent: View? = null) { builder.build() } -private class VerticalLinearRecyclerViewHelper(private val view: RecyclerView, private val parent: View?) : - FastScroller.ViewHelper { +private class VerticalLinearRecyclerViewHelper( + private val view: RecyclerView, + private val parent: View? +) : FastScroller.ViewHelper { override fun addOnPreDrawListener(onPreDraw: Runnable) { - view.addItemDecoration(object : RecyclerView.ItemDecoration() { + view.addItemDecoration(object : ItemDecoration() { override fun onDraw( canvas: Canvas, parent: RecyclerView, state: RecyclerView.State @@ -407,7 +427,7 @@ private class VerticalLinearRecyclerViewHelper(private val view: RecyclerView, p val position = getItemAdapterPositionForPopup() return if (position == RecyclerView.NO_POSITION) { null - } else popupTextProvider.getPopupText(position) + } else popupTextProvider.getPopupText(view, position) } private fun getItemCount(): Int { @@ -418,7 +438,8 @@ private class VerticalLinearRecyclerViewHelper(private val view: RecyclerView, p if (view.childCount == 0) { return RecyclerView.NO_POSITION } - return verticalLinearLayoutManager?.findFirstCompletelyVisibleItemPosition() ?: return RecyclerView.NO_POSITION + return verticalLinearLayoutManager?.findFirstCompletelyVisibleItemPosition() + ?: return RecyclerView.NO_POSITION } private val verticalLinearLayoutManager: LinearLayoutManager? diff --git a/stub/build.gradle b/stub/build.gradle index c25d7c8f..ab78a503 100644 --- a/stub/build.gradle +++ b/stub/build.gradle @@ -3,10 +3,12 @@ plugins { } android { - compileSdkVersion 31 + namespace "stub" + compileSdk 31 + defaultConfig { - minSdkVersion 14 - targetSdkVersion 31 + minSdk 14 + targetSdk 31 } buildFeatures { buildConfig false @@ -21,11 +23,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } dependencies { - implementation "androidx.annotation:annotation:1.2.0" + implementation "androidx.annotation:annotation:$androidx_annotation_version" } diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml index 9992cbfa..cc947c56 100644 --- a/stub/src/main/AndroidManifest.xml +++ b/stub/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/widget/borderview/build.gradle b/widget/borderview/build.gradle index 3602ef0c..024b4aae 100644 --- a/widget/borderview/build.gradle +++ b/widget/borderview/build.gradle @@ -5,10 +5,12 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.widget.borderview" + compileSdk target_sdk + defaultConfig { - minSdkVersion 17 - targetSdkVersion target_sdk + minSdk 17 + targetSdk target_sdk versionCode 1 versionName '1.1.0' consumerProguardFiles 'consumer-rules.pro' @@ -23,8 +25,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/widget/borderview/src/main/AndroidManifest.xml b/widget/borderview/src/main/AndroidManifest.xml index eb7ae896..cc947c56 100644 --- a/widget/borderview/src/main/AndroidManifest.xml +++ b/widget/borderview/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/widget/mainswitchbar/build.gradle b/widget/mainswitchbar/build.gradle index 27afd4c2..21e05b1a 100644 --- a/widget/mainswitchbar/build.gradle +++ b/widget/mainswitchbar/build.gradle @@ -5,10 +5,12 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.widget.mainswitchbar" + compileSdk target_sdk + defaultConfig { - minSdkVersion 23 - targetSdkVersion target_sdk + minSdk 23 + targetSdk target_sdk versionCode 1 versionName '1.1.0' consumerProguardFiles 'consumer-rules.pro' @@ -23,8 +25,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/widget/mainswitchbar/src/main/AndroidManifest.xml b/widget/mainswitchbar/src/main/AndroidManifest.xml index 6e545655..cc947c56 100644 --- a/widget/mainswitchbar/src/main/AndroidManifest.xml +++ b/widget/mainswitchbar/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/widget/switchbar/build.gradle b/widget/switchbar/build.gradle index 86190a1a..14518e50 100644 --- a/widget/switchbar/build.gradle +++ b/widget/switchbar/build.gradle @@ -5,10 +5,12 @@ plugins { } android { - compileSdkVersion target_sdk + namespace "rikka.widget.switchbar" + compileSdk target_sdk + defaultConfig { - minSdkVersion 21 - targetSdkVersion target_sdk + minSdk 21 + targetSdk target_sdk versionCode 1 versionName rikka_widget_switcherbar_version consumerProguardFiles 'consumer-rules.pro' @@ -23,8 +25,8 @@ android { } } compileOptions { - targetCompatibility 1.8 - sourceCompatibility 1.8 + targetCompatibility 17 + sourceCompatibility 17 } } diff --git a/widget/switchbar/src/main/AndroidManifest.xml b/widget/switchbar/src/main/AndroidManifest.xml index cc047354..cc947c56 100644 --- a/widget/switchbar/src/main/AndroidManifest.xml +++ b/widget/switchbar/src/main/AndroidManifest.xml @@ -1 +1 @@ - +