mirror of
				https://github.com/InsanusMokrassar/KSLog.git
				synced 2025-11-04 05:20:38 +00:00 
			
		
		
		
	Compare commits
	
		
			20 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| a71405aff5 | |||
| a2b497d0f9 | |||
| c5974fb51c | |||
| 3240b63f21 | |||
| fffafc4da7 | |||
| b1d5ce2135 | |||
| 0b8db9be35 | |||
| 5030ecc255 | |||
| b5669d2187 | |||
| ed7ad35605 | |||
| 6d5ddafefc | |||
| ee31c61677 | |||
| 1be14aa28e | |||
| 97b432c0b0 | |||
| 74a0ad8fd1 | |||
| 502dd4d607 | |||
| 079fbaa7f4 | |||
| 99dac12a27 | |||
| b0cc6c11ea | |||
| 58161132dc | 
							
								
								
									
										8
									
								
								.github/workflows/publish.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/publish.yml
									
									
									
									
										vendored
									
									
								
							@@ -8,9 +8,6 @@ jobs:
 | 
				
			|||||||
      - uses: actions/setup-java@v1
 | 
					      - uses: actions/setup-java@v1
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          java-version: 11
 | 
					          java-version: 11
 | 
				
			||||||
      - name: Fix android 32.0.0 dx
 | 
					 | 
				
			||||||
        continue-on-error: true
 | 
					 | 
				
			||||||
        run: cd /usr/local/lib/android/sdk/build-tools/32.0.0/ && mv d8 dx && cd lib  && mv d8.jar dx.jar
 | 
					 | 
				
			||||||
      - name: Rewrite version
 | 
					      - name: Rewrite version
 | 
				
			||||||
        run: |
 | 
					        run: |
 | 
				
			||||||
          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
 | 
					          branch="`echo "${{ github.ref }}" | grep -o "[^/]*$"`"
 | 
				
			||||||
@@ -19,6 +16,11 @@ jobs:
 | 
				
			|||||||
          mv gradle.properties.tmp gradle.properties
 | 
					          mv gradle.properties.tmp gradle.properties
 | 
				
			||||||
      - name: Build
 | 
					      - name: Build
 | 
				
			||||||
        run: ./gradlew build
 | 
					        run: ./gradlew build
 | 
				
			||||||
 | 
					      - name: Publish to Gitea
 | 
				
			||||||
 | 
					        continue-on-error: true
 | 
				
			||||||
 | 
					        run: ./gradlew publishAllPublicationsToGiteaRepository
 | 
				
			||||||
 | 
					        env:
 | 
				
			||||||
 | 
					          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
 | 
				
			||||||
      - name: Publish
 | 
					      - name: Publish
 | 
				
			||||||
        continue-on-error: true
 | 
					        continue-on-error: true
 | 
				
			||||||
        run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository
 | 
					        run: ./gradlew --no-parallel publishAllPublicationsToGithubPackagesRepository
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										13
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,18 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## 1.1.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					* `Kotlin`: `1.8.20`
 | 
				
			||||||
 | 
					* Standard factory `KSLog` with `String` arg now use `TagLogger`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## 1.0.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					* `Kotlin`: `1.8.0`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## 0.5.4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					* `Kotlin`: `1.7.22`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## 0.5.3
 | 
					## 0.5.3
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* `Kotlin`: `1.7.20`
 | 
					* `Kotlin`: `1.7.20`
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,6 +5,9 @@ It is simple and easy-to-use tool for logging on the most popular platforms in K
 | 
				
			|||||||

 | 
					
 | 
				
			||||||

 | 
					
 | 
				
			||||||

 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[](https://insanusmokrassar.github.io/KSLog/)
 | 
					[](https://insanusmokrassar.github.io/KSLog/)
 | 
				
			||||||
[](https://bookstack.inmo.dev/books/kslog)
 | 
					[](https://bookstack.inmo.dev/books/kslog)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,10 +5,10 @@ kotlin.incremental=true
 | 
				
			|||||||
kotlin.incremental.js=true
 | 
					kotlin.incremental.js=true
 | 
				
			||||||
android.useAndroidX=true
 | 
					android.useAndroidX=true
 | 
				
			||||||
android.enableJetifier=true
 | 
					android.enableJetifier=true
 | 
				
			||||||
org.gradle.jvmargs=-Xmx196m
 | 
					org.gradle.jvmargs=-Xmx512m
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Project data
 | 
					# Project data
 | 
				
			||||||
 | 
					
 | 
				
			||||||
group=dev.inmo
 | 
					group=dev.inmo
 | 
				
			||||||
version=0.5.3
 | 
					version=1.1.0
 | 
				
			||||||
android_code_version=16
 | 
					android_code_version=19
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,9 @@
 | 
				
			|||||||
[versions]
 | 
					[versions]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin = "1.7.20"
 | 
					kotlin = "1.8.20"
 | 
				
			||||||
kotlin-gradle-plugin = "7.2.2"
 | 
					kotlin-gradle-plugin = "7.3.1"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					dokka = "1.8.10"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dexcount = "3.1.0"
 | 
					dexcount = "3.1.0"
 | 
				
			||||||
junit_version = "4.12"
 | 
					junit_version = "4.12"
 | 
				
			||||||
@@ -10,7 +12,7 @@ espresso_core = "3.4.0"
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
android-minSdk = "21"
 | 
					android-minSdk = "21"
 | 
				
			||||||
android-compileSdk = "33"
 | 
					android-compileSdk = "33"
 | 
				
			||||||
android-buildTools = "33.0.0"
 | 
					android-buildTools = "33.0.1"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
github-release = "2.4.1"
 | 
					github-release = "2.4.1"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -29,10 +31,10 @@ android-test-espresso-core = { module = "androidx.test.espresso:espresso-core",
 | 
				
			|||||||
android-tools-build = { module = "com.android.tools.build:gradle", version.ref = "kotlin-gradle-plugin" }
 | 
					android-tools-build = { module = "com.android.tools.build:gradle", version.ref = "kotlin-gradle-plugin" }
 | 
				
			||||||
android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" }
 | 
					android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" }
 | 
				
			||||||
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 | 
					kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 | 
				
			||||||
kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "kotlin" }
 | 
					kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 | 
				
			||||||
github-release = { module = "com.github.breadmoirai:github-release", version.ref = "github-release" }
 | 
					github-release = { module = "com.github.breadmoirai:github-release", version.ref = "github-release" }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[plugins]
 | 
					[plugins]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 | 
					kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 | 
				
			||||||
kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" }
 | 
					kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -49,20 +49,40 @@ publishing {
 | 
				
			|||||||
                maven {
 | 
					                maven {
 | 
				
			||||||
                    name = "GithubPackages"
 | 
					                    name = "GithubPackages"
 | 
				
			||||||
                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/KSLog")
 | 
					                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/KSLog")
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
                    credentials {
 | 
					                    credentials {
 | 
				
			||||||
                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
 | 
					                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
 | 
				
			||||||
                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
 | 
					                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
 | 
				
			||||||
 | 
					                maven {
 | 
				
			||||||
 | 
					                    name = "Gitea"
 | 
				
			||||||
 | 
					                    url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
 | 
					                    credentials(HttpHeaderCredentials) {
 | 
				
			||||||
 | 
					                        name = "Authorization"
 | 
				
			||||||
 | 
					                        value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
 | 
					                    authentication {
 | 
				
			||||||
 | 
					                        header(HttpHeaderAuthentication)
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
 | 
					            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
 | 
				
			||||||
                maven {
 | 
					                maven {
 | 
				
			||||||
                    name = "sonatype"
 | 
					                    name = "sonatype"
 | 
				
			||||||
                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
 | 
					                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
                    credentials {
 | 
					                    credentials {
 | 
				
			||||||
                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
 | 
					                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
 | 
				
			||||||
                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
 | 
					                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1 +1 @@
 | 
				
			|||||||
{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"Simple logging library for kotlin","url":"https://github.com/InsanusMokrassar/KSLog","vcsUrl":"https://github.com/InsanusMokrassar/KSLog.git","developers":[{"id":"Akkihi","name":"Akkihi","eMail":"akkihiguy@gmail.com"},{"id":"InsanusMokrassar","name":"InsanusMokrassar","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/KSLog"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
 | 
					{"licenses":[{"id":"MIT","title":"MIT License","url":"https://opensource.org/licenses/MIT"}],"mavenConfig":{"name":"${project.name}","description":"Simple logging library for kotlin","url":"https://github.com/InsanusMokrassar/KSLog","vcsUrl":"https://github.com/InsanusMokrassar/KSLog.git","developers":[{"id":"Akkihi","name":"Akkihi","eMail":"akkihiguy@gmail.com"},{"id":"InsanusMokrassar","name":"InsanusMokrassar","eMail":"ovsyannikov.alexey95@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/KSLog"},{"name":"Gitea","url":"https://git.inmo.dev/api/packages/InsanusMokrassar/maven","credsType":{"type":"dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository.CredentialsType.HttpHeaderCredentials","headerName":"Authorization","headerValueProperty":"GITEA_TOKEN"}},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
 | 
				
			||||||
@@ -68,7 +68,11 @@ internal val printlnLogging: (level: LogLevel, tag: String, message: Any, throwa
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
fun KSLog(
 | 
					fun KSLog(
 | 
				
			||||||
    defaultTag: String,
 | 
					    defaultTag: String,
 | 
				
			||||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
					): KSLog = TagLogger(defaultTag)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					fun KSLog(
 | 
				
			||||||
 | 
					    defaultTag: String,
 | 
				
			||||||
 | 
					    messageFormatter: MessageFormatter
 | 
				
			||||||
): KSLog = DefaultKSLog(
 | 
					): KSLog = DefaultKSLog(
 | 
				
			||||||
    defaultTag,
 | 
					    defaultTag,
 | 
				
			||||||
    messageFormatter
 | 
					    messageFormatter
 | 
				
			||||||
@@ -79,11 +83,10 @@ fun KSLog(
 | 
				
			|||||||
    defaultTag: String,
 | 
					    defaultTag: String,
 | 
				
			||||||
    filter: MessageFilter,
 | 
					    filter: MessageFilter,
 | 
				
			||||||
    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
					    messageFormatter: MessageFormatter = defaultMessageFormatter
 | 
				
			||||||
): KSLog = DefaultKSLog(
 | 
					): KSLog = KSLog (
 | 
				
			||||||
    defaultTag,
 | 
					    defaultTag,
 | 
				
			||||||
    filter,
 | 
					 | 
				
			||||||
    messageFormatter
 | 
					    messageFormatter
 | 
				
			||||||
)
 | 
					).filtered(filter)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fun KSLog(
 | 
					fun KSLog(
 | 
				
			||||||
    defaultTag: String,
 | 
					    defaultTag: String,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user