diff --git a/android/src/test/java/net/twisterrob/test/frameworks/MethodRuleAdapter.java b/android/src/test/java/net/twisterrob/test/frameworks/MethodRuleAdapter.java index dd62b1b2d..182c9d171 100644 --- a/android/src/test/java/net/twisterrob/test/frameworks/MethodRuleAdapter.java +++ b/android/src/test/java/net/twisterrob/test/frameworks/MethodRuleAdapter.java @@ -1,5 +1,6 @@ package net.twisterrob.test.frameworks; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.junit.rules.*; @@ -39,9 +40,11 @@ public MethodRuleAdapter(@NonNull MethodRule wrappedRule) { private @NonNull Object getTestObject(@NonNull Description testDescription) { try { - return testDescription.getTestClass().newInstance(); - } catch (InstantiationException | IllegalAccessException e) { - throw new IllegalStateException(e); + return testDescription.getTestClass().getDeclaredConstructor().newInstance(); + } catch (NoSuchMethodException | IllegalAccessException | InstantiationException ex) { + throw new IllegalStateException(ex); + } catch (InvocationTargetException ex) { + throw new RuntimeException(ex.getCause()); } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b664247ae..2eb02e6fb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] #java = "1.8" # -agp = "8.1.0" +agp = "8.1.1" # 23.0.0 + agp -agp-tools = "31.1.0" +agp-tools = "31.1.1" twisterrob = "0.16" # https://github.com/TWiStErRob/net.twisterrob.gradle/releases detekt = "1.23.0" -kotlin = "1.9.0" +kotlin = "1.9.10" kotlin-coroutines = "1.7.3" # TODEL NewerVersionAvailable lint exception @@ -17,9 +17,9 @@ slf4j = "1.7.36" dagger = "2.47" orbit = "6.0.0" -androidx-activity = "1.6.1" # https://developer.android.com/jetpack/androidx/releases/activity -androidx-annotation = "1.6.0" # https://developer.android.com/jetpack/androidx/releases/annotation -androidx-annotationExperimental = "1.3.0" # https://developer.android.com/jetpack/androidx/releases/annotation +androidx-activity = "1.7.2" # https://developer.android.com/jetpack/androidx/releases/activity +androidx-annotation = "1.7.0" # https://developer.android.com/jetpack/androidx/releases/annotation +androidx-annotationExperimental = "1.3.1" # https://developer.android.com/jetpack/androidx/releases/annotation androidx-appcompat = "1.6.1" # https://developer.android.com/jetpack/androidx/releases/appcompat androidx-archCore = "2.2.0" # https://developer.android.com/jetpack/androidx/releases/arch androidx-cardview = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/cardview @@ -27,31 +27,31 @@ androidx-collection = "1.2.0" # https://developer.android.com/jetpack/androidx/r androidx-concurrent = "1.1.0" # https://developer.android.com/jetpack/androidx/releases/concurrent androidx-constraintlayout = "2.1.4" # https://developer.android.com/jetpack/androidx/releases/constraintlayout androidx-coordinatorlayout = "1.2.0" # https://developer.android.com/jetpack/androidx/releases/coordinatorlayout -androidx-core = "1.9.0" # https://developer.android.com/jetpack/androidx/releases/core +androidx-core = "1.12.0" # https://developer.android.com/jetpack/androidx/releases/core androidx-cursoradapter = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/cursoradapter androidx-customview = "1.1.0" # https://developer.android.com/jetpack/androidx/releases/customview androidx-documentfile = "1.0.1" # https://developer.android.com/jetpack/androidx/releases/documentfile -androidx-drawerlayout = "1.1.1" # https://developer.android.com/jetpack/androidx/releases/drawerlayout +androidx-drawerlayout = "1.2.0" # https://developer.android.com/jetpack/androidx/releases/drawerlayout androidx-dynamicanimation = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/dynamicanimation androidx-exifinterface = "1.3.6" # https://developer.android.com/jetpack/androidx/releases/exifinterface -androidx-fragment = "1.5.5" # https://developer.android.com/jetpack/androidx/releases/fragment +androidx-fragment = "1.6.1" # https://developer.android.com/jetpack/androidx/releases/fragment androidx-interpolator = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/interpolator -androidx-lifecycle = "2.6.0" # https://developer.android.com/jetpack/androidx/releases/lifecycle +androidx-lifecycle = "2.6.2" # https://developer.android.com/jetpack/androidx/releases/lifecycle androidx-loader = "1.1.0" # https://developer.android.com/jetpack/androidx/releases/loader androidx-localbroadcastmanager = "1.1.0" # https://developer.android.com/jetpack/androidx/releases/localbroadcastmanager -androidx-material = "1.8.0" # https://github.com/material-components/material-components-android/releases +androidx-material = "1.9.0" # https://github.com/material-components/material-components-android/releases androidx-multidex = "2.0.1" # https://developer.android.com/jetpack/androidx/releases/multidex -androidx-preference = "1.2.0" # https://developer.android.com/jetpack/androidx/releases/preference +androidx-preference = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/preference androidx-print = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/print -androidx-recyclerview = "1.3.0" # https://developer.android.com/jetpack/androidx/releases/recyclerview -androidx-savedstate = "1.2.0" # https://developer.android.com/jetpack/androidx/releases/savedstate +androidx-recyclerview = "1.3.1" # https://developer.android.com/jetpack/androidx/releases/recyclerview +androidx-savedstate = "1.2.1" # https://developer.android.com/jetpack/androidx/releases/savedstate androidx-slidingpanelayout = "1.2.0" # https://developer.android.com/jetpack/androidx/releases/slidingpanelayout androidx-swiperefreshlayout = "1.1.0" # https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout androidx-transition = "1.4.1" # https://developer.android.com/jetpack/androidx/releases/transition androidx-vectordrawable = "1.1.0" # https://developer.android.com/jetpack/androidx/releases/vectordrawable androidx-viewpager = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/viewpager androidx-viewpager2 = "1.0.0" # https://developer.android.com/jetpack/androidx/releases/viewpager2 -androidx-webkit = "1.7.0" # https://developer.android.com/jetpack/androidx/releases/webkit +androidx-webkit = "1.8.0" # https://developer.android.com/jetpack/androidx/releases/webkit androidx-test-junit = "1.1.5" # https://developer.android.com/jetpack/androidx/releases/test androidx-test-core = "1.5.0" # https://developer.android.com/jetpack/androidx/releases/test androidx-test-monitor = "1.6.1" # https://developer.android.com/jetpack/androidx/releases/test @@ -60,7 +60,7 @@ androidx-test-runner = "1.5.2" # https://developer.android.com/jetpack/androidx/ androidx-test-espresso = "3.5.1" # https://developer.android.com/jetpack/androidx/releases/test xalan = "2.7.1" -saxon = "9.7.0-7" +saxon = "10.6" javaxInject = "1" guava = "27.0.1-jre" jbrAnn = "24.0.1" diff --git a/gradle/plugins-inventory/src/main/kotlin/net/twisterrob/inventory/build/android.base.gradle.kts b/gradle/plugins-inventory/src/main/kotlin/net/twisterrob/inventory/build/android.base.gradle.kts index 77c819ce1..07ba07b8d 100644 --- a/gradle/plugins-inventory/src/main/kotlin/net/twisterrob/inventory/build/android.base.gradle.kts +++ b/gradle/plugins-inventory/src/main/kotlin/net/twisterrob/inventory/build/android.base.gradle.kts @@ -16,7 +16,7 @@ dependencies { android { namespace = project.autoNamespace - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 } diff --git a/libs b/libs index 1d1df61bc..287213970 160000 --- a/libs +++ b/libs @@ -1 +1 @@ -Subproject commit 1d1df61bc330cce281dca88d7d10aa6a17a3b693 +Subproject commit 2872139709c6d3186bbf384b14ec03c851e30210