Merge branch 'master' into update_javadoc_pr_8874

# Conflicts: # gradle/libs.versions.toml
robolectric · Mar 11, 2024 · abd9762 · abd9762
2 parents 6807972 + fc9bc2e
commit abd9762
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ error-prone-javac = "9+181-r4173-1"
 error-prone-gradle = "3.1.0"
 
 # https://kotlinlang.org/docs/releases.html#release-details
-kotlin = "1.9.22"
+kotlin = "1.9.23"
 
 # https://github.com/Kotlin/kotlinx.coroutines/releases/
 kotlinx-coroutines = '1.8.0'
@@ -80,7 +80,7 @@ jetbrains-annotations = "24.1.0"
 junit4 = "4.13.2"
 
 # https://github.com/google/libphonenumber/releases
-libphonenumber = "8.13.31"
+libphonenumber = "8.13.32"
 
 # https://github.com/mockito/mockito/releases
 mockito = "4.11.0"

diff --git a/resources/src/main/java/org/robolectric/manifest/AndroidManifest.java b/resources/src/main/java/org/robolectric/manifest/AndroidManifest.java
@@ -614,7 +614,7 @@ public String getAppComponentFactory() {
    * <p>Note that if {@link #targetSdkVersion} isn't set, this value changes the behavior of some
    * Android code (notably {@link android.content.SharedPreferences}) to emulate old bugs.
    *
-   * @return the minimum SDK version, or Jelly Bean (16) by default
+   * @return the minimum SDK version, or KitKat (19) by default
    */
   @Override
   public int getMinSdkVersion() {
@@ -629,7 +629,7 @@ public int getMinSdkVersion() {
    * <p>Note that this value changes the behavior of some Android code (notably {@link
    * android.content.SharedPreferences}) to emulate old bugs.
    *
-   * @return the minimum SDK version, or Jelly Bean (16) by default
+   * @return the target SDK version, or KitKat (19) by default
    */
   @Override
   public int getTargetSdkVersion() {