Refactor tinylog 3

Author: pmwmedia

.github/renovate.json

@@ -1,17 +1,34 @@
 {
     "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": [ "config:base" ],
+    "extends": [
+        "config:recommended"
+    ],
     "packageRules": [
         {
-            "matchUpdateTypes": [ "minor", "patch" ],
+            "matchUpdateTypes": [
+                "minor",
+                "patch"
+            ],
             "automerge": true,
             "automergeType": "branch",
             "automergeStrategy": "rebase"
         },
         {
-            "matchPackagePatterns": ["^org.tinylog:"],
+            "matchUpdateTypes": [
+                "major",
+                "minor"
+            ],
+            "enabled": false,
+            "matchPackageNames": [
+                "/^org.robolectric:android-all/"
+            ]
+        },
+        {
             "matchCurrentValue": "/-SNAPSHOT$/",
-            "enabled": false
+            "enabled": false,
+            "matchPackageNames": [
+                "/^org.tinylog:/"
+            ]
         }
     ]
 }

.github/workflows/build.yaml

@@ -2,35 +2,27 @@ name: Build Repository
 
 on:
   push:
-    branches: [ "v*" ]
-  pull_request:
     branches: [ "**" ]
+  pull_request:
+    branches-ignore: [ "renovate/**" ]
 
 jobs:
 
   build:
 
     name: Build with JDK ${{ matrix.jdk }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       fail-fast: false
       matrix:
-        jdk: [ 11, 17 ]
+        jdk: [ 11, 17, 21 ]
 
     steps:
 
       - name: Checkout Git repository
         uses: actions/checkout@v4
 
-      - name: Restore local Maven repository
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: tinylog3-jvm-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            tinylog3-jvm-${{ runner.os }}-maven-
-
       - name: Download and install JDK ${{ matrix.jdk }}
         uses: actions/setup-java@v4
         with:
@@ -49,78 +41,41 @@ jobs:
   android-tests:
 
     name: Tests on Android (API level ${{ matrix.api-level }})
-    runs-on: macos-13
-    timeout-minutes: 60
+    runs-on: ubuntu-24.04
+    timeout-minutes: 30
 
     strategy:
       fail-fast: false
       matrix:
-        api-level: [ 26, 33 ]
+        api-level: [ 26, 35 ]
 
     steps:
 
       - name: Checkout Git repository
         uses: actions/checkout@v4
 
-      - name: Restore local Maven repository
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: tinylog3-android-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            tinylog3-android-${{ runner.os }}-maven-
-
-      - name: Restore Gradle caches and wrapper
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: tinylog3-android-${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            tinylog3-android-${{ runner.os }}-gradle-
-
-      - name: Restore Android virtual device
-        id: avd-cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: tinylog3-${{ runner.os }}-avd${{ matrix.api-level }}
-
       - name: Download and install JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 17
 
-      - name: Install core and impl artifacts via Maven
+      - name: Install tinylog artifacts via Maven
         run: mvn --batch-mode --update-snapshots --also-make --projects :tinylog-core,:tinylog-impl install -DskipTests
 
-      - name: Set up Android virtual device if not cached
-        uses: reactivecircus/android-emulator-runner@v2
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: x86_64
-          target: ${{ matrix.api-level >= 30 && 'google_apis' || 'default' }}
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
-          script: echo "Generated AVD snapshot for caching."
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
 
       - name: Run instrumented tests on Android virtual device
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
-          target: ${{ matrix.api-level >= 30 && 'google_apis' || 'default' }}
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          working-directory: ./tinylog-android-tests
-          script: chmod +x ./gradlew && ./gradlew createDebugCoverageReport spotbugsDebug checkstyle
+          working-directory: ./android-tests
+          script: ./gradlew createDebugCoverageReport spotbugsDebug checkstyle --no-daemon --no-build-cache
 
       - name: Upload code coverage report
         uses: codecov/codecov-action@v4

tinylog-android-tests/build.gradle renamed to android-tests/build.gradle

@@ -13,10 +13,10 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:8.3.2"
-        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.2"
-        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.10.0.0"
-        classpath "org.jacoco:org.jacoco.core:0.8.12"
+        classpath "com.android.tools.build:gradle:8.9.1"
+        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.7"
+        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.12.0.0"
+        classpath "org.jacoco:org.jacoco.core:0.8.13"
     }
 }
 
@@ -30,33 +30,21 @@ repositories {
 dependencies {
     implementation "org.tinylog:tinylog-core:${version}"
     implementation "org.tinylog:tinylog-impl:${version}"
-    androidTestImplementation "androidx.test:runner:1.5.2"
-    androidTestImplementation "de.mannodermaus.junit5:android-test-core:1.4.0"
-    androidTestImplementation "javax.inject:javax.inject:1"
-    androidTestImplementation "org.assertj:assertj-core:3.25.3"
-    androidTestImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
-    androidTestImplementation "org.junit.jupiter:junit-jupiter-params:5.10.2"
-    androidTestImplementation "org.mockito:mockito-android:5.11.0"
+    androidTestImplementation "androidx.test:runner:1.6.2"
+    androidTestImplementation "de.mannodermaus.junit5:android-test-core:1.7.0"
+    androidTestImplementation "jakarta.inject:jakarta.inject-api:2.0.1"
+    androidTestImplementation "org.assertj:assertj-core:3.27.3"
+    androidTestImplementation "org.junit.jupiter:junit-jupiter-api:5.12.2"
+    androidTestImplementation "org.junit.jupiter:junit-jupiter-params:5.12.2"
+    androidTestImplementation "org.mockito:mockito-android:5.17.0"
     androidTestImplementation "org.tinylog:tinylog-core:${version}:tests"
-    androidTestImplementation "org.tinylog:tinylog-impl:${version}:tests"
-    androidTestRuntimeOnly "de.mannodermaus.junit5:android-test-runner:1.4.0"
+    androidTestRuntimeOnly "de.mannodermaus.junit5:android-test-runner:1.7.0"
 }
 
 android {
-    namespace "tinylog"
-    buildToolsVersion "30.0.3"
+    namespace = "tinylog"
 
-    sourceSets {
-        main {
-            java {
-                srcDirs += "../tinylog-core/src/main/java"
-                srcDirs += "../tinylog-impl/src/main/java"
-                exclude "**/JavaRuntime.java", "**/JdbcWriter*.java", "**/JndiValueResolver.java"
-            }
-        }
-    }
-
-    compileSdkVersion 33
+    compileSdkVersion 35
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -65,13 +53,13 @@ android {
 
     buildTypes {
         debug {
-            testCoverageEnabled true
+            testCoverageEnabled = true
         }
     }
 
     defaultConfig {
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArgument("runnerBuilder", "de.mannodermaus.junit5.AndroidJUnit5Builder")
     }
@@ -82,11 +70,15 @@ android {
     }
 }
 
+checkstyle {
+    toolVersion = "10.23.0"
+}
+
 spotbugs {
     excludeFilter = file("../configuration/spotbugs-filters.xml")
 }
 
-task checkstyle(type: Checkstyle) {
+tasks.register("checkstyle", Checkstyle) {
     configFile file("../configuration/checkstyle-rules.xml")
     configProperties["workspace_loc"] = file("..").path
     source "src"

tinylog-android-tests/gradle.properties renamed to android-tests/gradle.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

android-tests/gradle/wrapper/gradle-wrapper.jar

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.