Skip to content

Commit

Permalink
Merge pull request #2 from saschpe/updates
Browse files Browse the repository at this point in the history
Update to 3rd-party components
  • Loading branch information
saschpe authored Apr 22, 2022
2 parents bfc7727 + 8396129 commit 1d7fc39
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 14 deletions.
46 changes: 36 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/
Expand Down Expand Up @@ -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/
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion .gitignore-custom
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
buildscript {
repositories {
mavenCentral()
google()
}
dependencies {
Expand All @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 1d7fc39

Please sign in to comment.