Skip to content

Commit

Permalink
Merge pull request #22 from saschpe/saschpe.updates
Browse files Browse the repository at this point in the history
Various updates
  • Loading branch information
saschpe authored Jun 24, 2024
2 parents 6403575 + 1751ca1 commit 2239734
Show file tree
Hide file tree
Showing 6 changed files with 538 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# 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-js-store
.kotlin
### Generated by gibo (https://github.com/simonwhitaker/gibo)
### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Android.gitignore

Expand Down
6 changes: 3 additions & 3 deletions .gitignore-custom
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# 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-js-store
.kotlin
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add iosX64, tvosX64 and watchosX64 build target
- 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)

## [1.1.0] - 2023-09-14
### Changed
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ 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
Expand Down
Loading

0 comments on commit 2239734

Please sign in to comment.