Skip to content

Commit 423a328

Browse files
authored
Merge pull request #1 from TheHelloWorldWriter/release/classic-v2.2.0
Merge release/classic-v2.2.0 into classic-main - Upgrade to latest Gradle/SDK & adaptive icon
2 parents 12a08cd + acc185d commit 423a328

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+703
-763
lines changed

.gitignore

Lines changed: 14 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,17 @@
1-
2-
# Created by https://www.gitignore.io/api/android,intellij+iml,java,gradle
3-
4-
### Android ###
5-
# Built application files
6-
*.apk
7-
*.ap_
8-
9-
# Files for the ART/Dalvik VM
10-
*.dex
11-
12-
# Java class files
13-
*.class
14-
15-
# Generated files
16-
bin/
17-
gen/
18-
out/
19-
20-
# Gradle files
21-
.gradle/
22-
build/
23-
24-
# Local configuration file (sdk path, etc)
25-
local.properties
26-
27-
# Proguard folder generated by Eclipse
28-
proguard/
29-
30-
# Log Files
31-
*.log
32-
33-
# Android Studio Navigation editor temp files
34-
.navigation/
35-
36-
# Android Studio captures folder
37-
captures/
38-
39-
# Intellij
401
*.iml
41-
.idea/workspace.xml
42-
.idea/tasks.xml
43-
.idea/libraries
44-
45-
# Keystore files
46-
*.jks
47-
48-
# External native build folder generated in Android Studio 2.2 and later
49-
.externalNativeBuild
50-
51-
### Android Patch ###
52-
gen-external-apklibs
53-
54-
55-
### Intellij+iml ###
56-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
57-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
58-
59-
# User-specific stuff:
60-
61-
# Sensitive or high-churn files:
62-
.idea/dataSources/
63-
.idea/dataSources.ids
64-
.idea/dataSources.xml
65-
.idea/dataSources.local.xml
66-
.idea/sqlDataSources.xml
67-
.idea/dynamic.xml
68-
.idea/uiDesigner.xml
69-
70-
# Gradle:
71-
.idea/gradle.xml
72-
73-
# Mongo Explorer plugin:
74-
.idea/mongoSettings.xml
75-
76-
## File-based project format:
77-
*.iws
78-
79-
## Plugin-specific files:
80-
81-
# IntelliJ
82-
/out/
83-
84-
# mpeltonen/sbt-idea plugin
85-
.idea_modules/
86-
87-
# JIRA plugin
88-
atlassian-ide-plugin.xml
89-
90-
# Crashlytics plugin (for Android Studio and IntelliJ)
91-
com_crashlytics_export_strings.xml
92-
crashlytics.properties
93-
crashlytics-build.properties
94-
fabric.properties
95-
96-
### Intellij+iml Patch ###
97-
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
98-
99-
modules.xml
100-
.idea/misc.xml
101-
*.ipr
102-
103-
104-
### Java ###
105-
106-
# BlueJ files
107-
*.ctxt
108-
109-
# Mobile Tools for Java (J2ME)
110-
.mtj.tmp/
111-
112-
# Package Files #
113-
*.jar
114-
*.war
115-
*.ear
116-
117-
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
118-
hs_err_pid*
119-
120-
121-
### Gradle ###
1222
.gradle
123-
/build/
124-
125-
# Ignore Gradle GUI config
126-
gradle-app.setting
127-
128-
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
129-
!gradle-wrapper.jar
130-
131-
# Cache of project
132-
.gradletasknamecache
133-
134-
# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
135-
# gradle/wrapper/gradle-wrapper.properties
3+
/local.properties
4+
/.idea/caches
5+
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
10+
.DS_Store
11+
/build
12+
/captures
13+
.externalNativeBuild
14+
.cxx
15+
local.properties
13616

137-
# End of https://www.gitignore.io/api/android,intellij+iml,java,gradle
17+
.idea/icon.svg

.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/AndroidProjectSystem.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dictionaries/Aurelian.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/migrations.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)