From f387a2155a64182d23fea71916cd5d46e1e82abc Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 22 Apr 2022 09:10:05 +0200 Subject: [PATCH 1/3] Git: Ignore macOS files --- .gitignore | 46 ++++++++++++++++++++++++++++++++++++---------- .gitignore-custom | 2 +- 2 files changed, 37 insertions(+), 11 deletions(-) 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 From 4a2b35523cdea2300c8fd28dc9ee5a2b9bf196fb Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 22 Apr 2022 09:10:23 +0200 Subject: [PATCH 2/3] Gradle: Update wrapper to 7.4.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 83961296768ff70d11188e9ea70c5c264c34f760 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 22 Apr 2022 10:49:44 +0200 Subject: [PATCH 3/3] Kotlin: Update to final 1.6.20 build --- .idea/codeStyles/Project.xml | 1 - build.gradle.kts | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) 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" }