Skip to content

Commit b91f141

Browse files
authored
Merge pull request #20 from e16din/master
Fixed bugs, updated performance
2 parents 0f0e588 + 5e3430b commit b91f141

File tree

18 files changed

+467
-433
lines changed

18 files changed

+467
-433
lines changed

.gitignore

Lines changed: 58 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
### Android ###
12
# Built application files
23
*.apk
34
*.ap_
45

5-
# Files for the ART/Dalvik VM
6+
# Files for the Dalvik VM
67
*.dex
78

89
# Java class files
@@ -11,11 +12,17 @@
1112
# Generated files
1213
bin/
1314
gen/
14-
out/
1515

1616
# Gradle files
1717
.gradle/
1818
build/
19+
/*/build/
20+
21+
# Ignore Gradle GUI config
22+
gradle-app.setting
23+
24+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
25+
!gradle-wrapper.jar
1926

2027
# Local configuration file (sdk path, etc)
2128
local.properties
@@ -26,15 +33,57 @@ proguard/
2633
# Log Files
2734
*.log
2835

29-
# Android Studio Navigation editor temp files
30-
.navigation/
36+
### Android Patch ###
37+
gen-external-apklibs
3138

32-
# Android Studio captures folder
33-
captures/
3439

35-
# Intellij
40+
### Intellij ###
41+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
42+
3643
*.iml
44+
45+
## Directory-based project format:
3746
.idea/
47+
# if you remove the above rule, at least ignore the following:
48+
49+
# User-specific stuff:
50+
# .idea/workspace.xml
51+
# .idea/tasks.xml
52+
# .idea/dictionaries
53+
54+
# Sensitive or high-churn files:
55+
# .idea/dataSources.ids
56+
# .idea/dataSources.xml
57+
# .idea/sqlDataSources.xml
58+
# .idea/dynamic.xml
59+
# .idea/uiDesigner.xml
60+
61+
# Gradle:
62+
# .idea/gradle.xml
63+
# .idea/libraries
64+
65+
# Mongo Explorer plugin:
66+
# .idea/mongoSettings.xml
3867

39-
# Keystore files
40-
*.jks
68+
## File-based project format:
69+
*.ipr
70+
*.iws
71+
72+
## Plugin-specific files:
73+
74+
# IntelliJ
75+
/out/
76+
77+
# mpeltonen/sbt-idea plugin
78+
.idea_modules/
79+
80+
# JIRA plugin
81+
atlassian-ide-plugin.xml
82+
83+
# Crashlytics plugin (for Android Studio and IntelliJ)
84+
com_crashlytics_export_strings.xml
85+
crashlytics.properties
86+
crashlytics-build.properties
87+
*.iml
88+
89+
*.iml

codeview/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
33

44
android {
55
compileSdkVersion 24
6-
buildToolsVersion "24.0.1"
6+
buildToolsVersion "24.0.2"
77

88
defaultConfig {
99
minSdkVersion 15
@@ -23,9 +23,6 @@ android {
2323
}
2424

2525
dependencies {
26-
compile fileTree(dir: 'libs', include: ['*.jar'])
27-
testCompile 'junit:junit:4.12'
28-
2926
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3027

3128
compile 'com.android.support:appcompat-v7:24.2.0'

codeview/src/androidTest/java/io/github/kbiakov/codeview/ApplicationTest.java

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

0 commit comments

Comments
 (0)