diff --git a/.gitignore b/.gitignore
index 2b77229..5495277 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
# Custom ignore rules, update with:
-# { cat .gitignore-custom ; gibo dump Android Gradle JetBrains Kotlin Vim } > .gitignore
+# { cat .gitignore-custom ; gibo dump Android Gradle JetBrains Kotlin macOS Vim } > .gitignore
.idea/artifacts
.idea/libraries-with-intellij-classes.xml
@@ -9,7 +9,7 @@
buildSrc/src/main/kotlin/Secrets.kt
kotlin-js-store
### Generated by gibo (https://github.com/simonwhitaker/gibo)
-### https://raw.github.com/github/gitignore/ce5da10a3a43c4dd8bd9572eda17c0a37ee0eac1/Android.gitignore
+### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Android.gitignore
# Gradle files
.gradle/
@@ -46,8 +46,7 @@ google-services.json
*.hprof
-### Generated by gibo (https://github.com/simonwhitaker/gibo)
-### https://raw.github.com/github/gitignore/ce5da10a3a43c4dd8bd9572eda17c0a37ee0eac1/Gradle.gitignore
+### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Gradle.gitignore
.gradle
**/build/
@@ -72,8 +71,7 @@ gradle-app.setting
.classpath
-### Generated by gibo (https://github.com/simonwhitaker/gibo)
-### https://raw.github.com/github/gitignore/ce5da10a3a43c4dd8bd9572eda17c0a37ee0eac1/Global/JetBrains.gitignore
+### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/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
@@ -154,8 +152,7 @@ fabric.properties
.idea/caches/build_file_checksums.ser
-### Generated by gibo (https://github.com/simonwhitaker/gibo)
-### https://raw.github.com/github/gitignore/ce5da10a3a43c4dd8bd9572eda17c0a37ee0eac1/Kotlin.gitignore
+### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Kotlin.gitignore
# Compiled class file
*.class
@@ -183,8 +180,37 @@ hs_err_pid*
replay_pid*
-### Generated by gibo (https://github.com/simonwhitaker/gibo)
-### https://raw.github.com/github/gitignore/ce5da10a3a43c4dd8bd9572eda17c0a37ee0eac1/Global/Vim.gitignore
+### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Global/macOS.gitignore
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### https://raw.github.com/github/gitignore/d0b80a469983a7beece8fa1f5c48a8242318b531/Global/Vim.gitignore
# Swap
[._]*.s[a-v][a-z]
diff --git a/.gitignore-custom b/.gitignore-custom
index 83e40dd..c88d5d4 100644
--- a/.gitignore-custom
+++ b/.gitignore-custom
@@ -1,5 +1,5 @@
# Custom ignore rules, update with:
-# { cat .gitignore-custom ; gibo dump Android Gradle JetBrains Kotlin Vim } > .gitignore
+# { cat .gitignore-custom ; gibo dump Android Gradle JetBrains Kotlin macOS Vim } > .gitignore
.idea/artifacts
.idea/libraries-with-intellij-classes.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index cb22ebb..4ff3d3c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -98,7 +98,6 @@
http://schemas.android.com/apk/res/android
- ANDROID_ATTRIBUTE_ORDER
diff --git a/build.gradle.kts b/build.gradle.kts
index a616cbe..cac8839 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,6 @@
buildscript {
repositories {
+ mavenCentral()
google()
}
dependencies {
@@ -8,7 +9,7 @@ buildscript {
}
plugins {
- kotlin("jvm") version "1.6.20-RC"
+ kotlin("jvm") version "1.6.20"
id("com.diffplug.spotless") version "6.3.0"
id("com.github.ben-manes.versions") version "0.42.0"
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d7e66b5..92f06b5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists