Merge branch 'android:main' into patch-1

Author: TWiStErRob

.bazelproject

@@ -19,4 +19,4 @@ additional_languages:
 
 
 # Please uncomment an android-SDK platform. Available SDKs are:
-android_sdk_platform: android-28
+android_sdk_platform: android-34

.bazelrc

@@ -3,3 +3,7 @@ build --javacopt=-g
 build --host_javacopt=-g
 
 build --experimental_google_legacy_api
+build --enable_platform_specific_config
+build:linux --sandbox_tmpfs_path=/tmp
+test --enable_platform_specific_config
+test:linux --sandbox_tmpfs_path=/tmp

.bazelversion

@@ -1 +1 @@
-6.2.0
+6.3.0

.github/workflows/ci.yml

@@ -1,30 +1,38 @@
 name: Build
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - 'axt_**_release_branch'
 
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - 'axt_**_release_branch'
+
+env:
+  cache-version: v1
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Large Runners
     timeout-minutes: 20
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
-      - name: Install Java 11
+      - name: Install Java 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: 'Cache Bazel files'
         uses: actions/cache@v3
         with:
           path: ~/.cache/bazel
-          key: ${{ runner.os }}-bazel-build-${{ github.sha }}
+          key: ${{ runner.os }}-${{ env.cache-version }}-bazel-build-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-bazel-build-
+            ${{ runner.os }}-${{ env.cache-version }}-bazel-build-
       - name: Build maven artifacts
         run: bazelisk build //:axt_m2repository
         shell: bash
@@ -49,23 +57,24 @@ jobs:
           rm -rf ~/.cache/bazel/*/*/external/
         shell: bash
   test:
-    runs-on: ubuntu-latest
+    runs-on:
+      group: Large Runners
     timeout-minutes: 20
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
-      - name: Install Java 11
+      - name: Install Java 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: 'Cache Bazel files'
         uses: actions/cache@v3
         with:
           path: ~/.cache/bazel
-          key: ${{ runner.os }}-bazel-test-${{ github.sha }}
+          key: ${{ runner.os }}-${{ env.cache-version }}-bazel-test-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-bazel-test-
+            ${{ runner.os }}-${{ env.cache-version }}-bazel-test-
       - name: Run Robolectric tests
         run: bazelisk test --test_tag_filters=robolectric --build_tag_filters=robolectric --test_output=all ...
         shell: bash
@@ -87,11 +96,11 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v3
-      - name: Install Java 11
+      - name: Install Java 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
       - name: Enable KVM group perms
         run: |
             echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -111,10 +120,14 @@ jobs:
         shell: bash
       - name: 'Setup Android SDK'
         uses: android-actions/setup-android@v2
+      - name: 'Setup gradle managed device'
+        run: |
+          cd ${{ github.workspace }}/gradle-tests
+          ./gradlew runner:nexusOneSetup -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" --no-watch-fs --info
       - name: 'Run gradle tests'
         run: |
           cd ${{ github.workspace }}/gradle-tests
-          ./gradlew nexusOneApi30DebugAndroidTest -Dorg.gradle.workers.max=1 -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true --info
+          ./gradlew nexusOneDebugAndroidTest -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" --no-watch-fs --stacktrace
         shell: bash
       - name: 'Upload test reports'
         if: success() || failure()
@@ -123,3 +136,4 @@ jobs:
           name: test-reports
           path: gradle-tests/**/build/reports/androidTests/
 
+

CHANGELOG_TEMPLATE.md

@@ -0,0 +1,11 @@
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+**Breaking API Changes**
+
+**Known Issues**

CONTRIBUTING.md

@@ -34,7 +34,7 @@ Currently only Linux is fully supported. Mac may work but is not regularly teste
 *   Install the [Android SDK](https://developer.android.com/studio/install) and
     run the following command to ensure you have the necessary components:
     `./tools/bin/sdkmanager --install 'build-tools;33.0.2'
-    'platforms;android-33' 'emulator' 'platform-tools'
+    'platforms;android-34' 'emulator' 'platform-tools'
 *   Set the `ANDROID_HOME` environment variable to point to the SDK install
     location. For example
     *   On Linux: `export ANDROID_HOME=/home/$USER/Android/Sdk`
@@ -46,7 +46,7 @@ Currently only Linux is fully supported. Mac may work but is not regularly teste
 
 Android Studio is recommended.
 
-*   Install the [Bazel Android Studio plugin](https://docs.bazel.build/versions/master/ide.html).
+*   Install the [Bazel Android Studio plugin](https://plugins.jetbrains.com/plugin/9185-bazel-for-android-studio)
 *   Setup Bazel Android Studio plugin:
     *   Navigate to `Settings > Other Settings > Bazel Settings`
     *   Update `Bazel binary location` to `/path/to/bazel/binary` (on Mac it's usually
@@ -87,7 +87,7 @@ To run the gradle integration tests:
 bazelisk build :axt_m2repository
 unzip bazel-bin/axt_m2repository.zip -d ~/.m2/
 cd gradle-tests
-./gradlew nexusOneApi30DebugAndroidTest
+./gradlew nexusOneDebugAndroidTest
 ```
 
 ### Troubleshooting

WORKSPACE

@@ -37,17 +37,6 @@ rules_proto_toolchains()
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-http_archive(
-    name = "rules_python",
-    sha256 = "0a8003b044294d7840ac7d9d73eef05d6ceb682d7516781a4ec62eeb34702578",
-    strip_prefix = "rules_python-0.24.0",
-    url = "https://github.com/bazelbuild/rules_python/releases/download/0.24.0/rules_python-0.24.0.tar.gz",
-)
-
-load("@rules_python//python:repositories.bzl", "py_repositories")
-
-py_repositories()
-
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@rules_jvm_external//:specs.bzl", "maven")
 load(
@@ -92,7 +81,7 @@ grpc_java_repositories()
 maven_install(
     name = "maven",
     artifacts = [
-        "androidx.annotation:annotation-jvm:" + ANDROIDX_ANNOTATION_VERSION,
+        "androidx.annotation:annotation:" + ANDROIDX_ANNOTATION_VERSION,
         "androidx.annotation:annotation-experimental:jar:" + ANDROIDX_ANNOTATION_EXPERIMENTAL_VERSION,
         "androidx.appcompat:appcompat:" + ANDROIDX_COMPAT_VERSION,
         "androidx.concurrent:concurrent-futures:" + ANDROIDX_CONCURRENT_VERSION,
@@ -179,7 +168,6 @@ maven_install(
         "org.pantsbuild:jarjar:1.7.2",
         "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
         "org.jetbrains.kotlinx:kotlinx-coroutines-core:%s" % KOTLINX_COROUTINES_VERSION,
-        "com.google.code.findbugs:jsr305:3.0.2",
         maven.artifact(
             artifact = "robolectric",
             exclusions = [
@@ -191,7 +179,7 @@ maven_install(
                 ),
             ],
             group = "org.robolectric",
-            version = "4.9",
+            version = "4.11.1",
         ),
     ],
     fetch_sources = True,
@@ -219,7 +207,7 @@ maven_install(
 
 android_sdk_repository(
     name = "androidsdk",
-    api_level = 33,
+    api_level = 34,
     build_tools_version = "33.0.2",
 )
 

annotation/CHANGELOG.md

@@ -0,0 +1,17 @@
+### Annotation {version} {:#annotation-{version}}
+
+{{date}}
+
+`androidx.test:annotation:{version}}` is released.
+
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+**Breaking API Changes**
+
+**Known Issues**

annotation/java/androidx/test/annotation/AndroidManifest.xml

@@ -18,7 +18,7 @@
     package="androidx.test.annotation">
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="33" />
+        android:minSdkVersion="19"
+        android:targetSdkVersion="34" />
 
 </manifest>

annotation/java/androidx/test/annotation/BUILD

@@ -21,8 +21,8 @@ android_library(
     manifest = "AndroidManifest.xml",
     tags = ["alt_dep=//annotation"],
     deps = [
+        "//opensource/androidx:annotation",
         "@maven//:androidx_annotation_annotation_experimental",
-        "@maven//:androidx_annotation_annotation_jvm",
     ],
 )