Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: saschpe/Log4K
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: release/1.3.1
Choose a base ref
...
head repository: saschpe/Log4K
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release/1.3.2
Choose a head ref
  • 15 commits
  • 26 files changed
  • 1 contributor

Commits on May 22, 2024

  1. Merge pull request #46 from saschpe/filelogger-api

    FileLogger API improvement
    saschpe authored May 22, 2024
    Copy the full SHA
    0206999 View commit details

Commits on May 23, 2024

  1. Github: Checkout main branch instead of ref on publish job

    To ensure the scripts/publish works as intended.
    saschpe committed May 23, 2024
    Copy the full SHA
    34a91ce View commit details

Commits on May 27, 2024

  1. Merge pull request #47 from saschpe/gh.checkout

    Github: Checkout `main` branch instead of ref on publish job
    saschpe authored May 27, 2024
    Copy the full SHA
    0e7b963 View commit details

Commits on Jun 12, 2024

  1. Use more unique (internal) content provider authorities.

    Avoids potential clashes in apps integrating the library
    saschpe committed Jun 12, 2024
    Copy the full SHA
    f235717 View commit details
  2. Merge pull request #48 from saschpe/saschpe.context-provider-authorities

    Use more unique (internal) content provider authorities.
    saschpe authored Jun 12, 2024
    Copy the full SHA
    60f80e2 View commit details
  3. Gradle: Update wrapper to version 8.8

    saschpe committed Jun 12, 2024
    Copy the full SHA
    8ce196a View commit details
  4. Merge pull request #49 from saschpe/saschpe.gradle88

    Gradle: Update wrapper to version 8.8
    saschpe authored Jun 12, 2024
    Copy the full SHA
    c15fc6f View commit details
  5. Use ktlint 1.3.0 for code formatting

    Not worth mentioning in CHANGELOG.md as this doesn't affect library
    users.
    saschpe committed Jun 12, 2024
    Copy the full SHA
    71b29c3 View commit details
  6. Merge pull request #51 from saschpe/saschpe.ktlint130

    saschpe authored Jun 12, 2024
    Copy the full SHA
    bf75857 View commit details
  7. Kotlin: Update to version 2.0.0

    Including matching kotlinx-io version 0.4.0 and kotlin-wrappers version
    pre.757. Adjust expect class declarations due to [stricter rules][0] for
    abstract members with the K2 compiler. See open [YouTrack issue][1].
    
    [0]: https://kotlinlang.org/docs/k2-compiler-migration-guide.html#stricter-rules-for-abstract-members-in-expected-classes
    [1]: https://youtrack.jetbrains.com/issue/KT-59739/K2-MPP-reports-ABSTRACTMEMBERNOTIMPLEMENTED-for-inheritor-in-common-code-when-the-implementation-is-located-in-the-actual
    saschpe committed Jun 12, 2024
    Copy the full SHA
    0e11914 View commit details
  8. Merge pull request #50 from saschpe/saschpe.kotlin20

    Kotlin: Update to version 2.0.0
    saschpe authored Jun 12, 2024
    Copy the full SHA
    556bf9b View commit details
  9. Gradle: Only query google repository for Android dependencies

    Avoid leaking all other used dependencies to Google servers and speed
    up dependency resolution.
    saschpe committed Jun 12, 2024
    Copy the full SHA
    dd13b03 View commit details
  10. Merge pull request #52 from saschpe/saschpe.gradle-repos

    Gradle: Only query google repository for Android dependencies
    saschpe authored Jun 12, 2024
    Copy the full SHA
    ea1e3d1 View commit details

Commits on Jun 19, 2024

  1. Add iosX64 build target

    saschpe committed Jun 19, 2024
    Copy the full SHA
    99cfcde View commit details
  2. Release version 1.3.2

    Signed-off-by: Sascha Peilicke <[email protected]>
    saschpe committed Jun 19, 2024
    Copy the full SHA
    1347fe4 View commit details
4 changes: 1 addition & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -22,8 +22,6 @@ jobs:
runs-on: macos-14
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
@@ -55,7 +53,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
ref: refs/heads/main
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
35 changes: 14 additions & 21 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Custom ignore rules, update with:
# { cat .gitignore-custom ; gibo dump Android Gradle JetBrains Kotlin macOS Vim } > .gitignore

**/pom.xml
*.jks
.idea/artifacts
.idea/libraries-with-intellij-classes.xml
.idea/misc.xml
**/pom.xml
*.jks
.kotlin
buildSrc/src/main/kotlin/Secrets.kt
kotlin-js-store
### Generated by gibo (https://github.com/simonwhitaker/gibo)
### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Android.gitignore
### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Android.gitignore

# Gradle files
.gradle/
@@ -44,9 +44,8 @@ google-services.json

# Android Profiling
*.hprof


### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Gradle.gitignore
### Generated by gibo (https://github.com/simonwhitaker/gibo)
### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Gradle.gitignore

.gradle
**/build/
@@ -69,9 +68,8 @@ gradle-app.setting
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath


### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Global/JetBrains.gitignore
### Generated by gibo (https://github.com/simonwhitaker/gibo)
### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Global/JetBrains.gitignore

# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
@@ -150,9 +148,8 @@ fabric.properties

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser


### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Kotlin.gitignore
### Generated by gibo (https://github.com/simonwhitaker/gibo)
### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Kotlin.gitignore

# Compiled class file
*.class
@@ -178,9 +175,8 @@ fabric.properties
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*


### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Global/macOS.gitignore
### Generated by gibo (https://github.com/simonwhitaker/gibo)
### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Global/macOS.gitignore

# General
.DS_Store
@@ -208,9 +204,8 @@ Icon
Network Trash Folder
Temporary Items
.apdisk


### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Global/Vim.gitignore
### Generated by gibo (https://github.com/simonwhitaker/gibo)
### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Global/Vim.gitignore

# Swap
[._]*.s[a-v][a-z]
@@ -231,5 +226,3 @@ Sessionx.vim
tags
# Persistent undo
[._]*.un~


6 changes: 3 additions & 3 deletions .gitignore-custom
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Custom ignore rules, update with:
# { cat .gitignore-custom ; gibo dump Android Gradle JetBrains Kotlin macOS Vim } > .gitignore

**/pom.xml
*.jks
.idea/artifacts
.idea/libraries-with-intellij-classes.xml
.idea/misc.xml
**/pom.xml
*.jks
.kotlin
buildSrc/src/main/kotlin/Secrets.kt
kotlin-js-store
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.3.2] - 2024-06-19
- Use more unique (internal) content provider authorities. Avoids potential clashes in apps integrating the library
- Dependency update:
- [Gradle 8.8](https://docs.gradle.org/8.8/release-notes.html)
- [Kotlin 2.0.0](https://github.com/JetBrains/kotlin/releases/tag/v2.0.0)
- [kotlinx-io 0.4.0](https://github.com/Kotlin/kotlinx-io/releases/tag/0.4.0)
- [kotlin-wrappers pre.757](https://github.com/JetBrains/kotlin-wrappers/releases/tag/pre.757)
- Add iosX64 build target

## [1.3.1] - 2024-05-22
- FileLogger: Remove constructor with `kotlinx.io.files.Path`
Avoids having to add kotlinx-io as a dependency when using the class
@@ -44,7 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- New library `log4k-slf4j`:
- `SLF4JLogger`: Forwards log statements to [SLF4J](https://www.slf4j.org), which in turn allows to
use [Logback])(https://logback.qos.ch) as a backend.
use [Logback](https://logback.qos.ch) as a backend.

## [1.2.0] - 2022-07-11

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ repositories {
}

dependencies {
implementation("de.peilicke.sascha:log4k:1.3.1")
implementation("de.peilicke.sascha:log4k:1.3.2")
}
```

@@ -40,7 +40,7 @@ Log.error("Oops!")
Log.assert("Something went wrong!", throwable)
```

or, if you prefer:
Or, if you prefer:

```kotlin
Log.verbose { "FYI" }
@@ -170,8 +170,8 @@ val httpClient = HttpClient(CIO) {

## Users

- [Alpha+ Player - Unofficial player for Soma FM](https://play.google.com/store/apps/details?id=saschpe.alphaplus)
- [GameOn - Get games on sale](https://play.google.com/store/apps/details?id=saschpe.gameon)
- [Alpha+ Player Unofficial player for Soma FM](https://play.google.com/store/apps/details?id=saschpe.alphaplus)
- [GameOn Get games on sale](https://play.google.com/store/apps/details?id=saschpe.gameon)

## License

4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ spotless {
}
kotlin {
target("**/*.kt")
ktlint("1.2.1").setEditorConfigPath(".editorconfig")
ktlint("1.3.0").setEditorConfigPath(".editorconfig")
}
kotlinGradle {
ktlint("1.2.1").setEditorConfigPath(".editorconfig")
ktlint("1.3.0").setEditorConfigPath(".editorconfig")
}
}

7 changes: 1 addition & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -6,10 +6,5 @@ org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
org.gradle.parallel=true

# Kotlin
kotlin.apple.xcodeCompatibility.nowarn=true
kotlin.code.style=official
kotlin.mpp.stability.nowarn=true

# Android
android.enableJetifier=true
android.injected.testOnly=false
android.useAndroidX=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -55,7 +55,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/.
Loading