Skip to content

Commit eac618b

Browse files
committed
Merge branch 'feature/rename' into develop
2 parents 06cee5c + bdee0f0 commit eac618b

File tree

70 files changed

+626
-540
lines changed

Some content is hidden

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

70 files changed

+626
-540
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
name: Run Tests
2626
command: ./gradlew lint test
2727
- store_artifacts:
28-
path: app/build/reports
28+
path: alog/build/reports
2929
destination: reports
3030
- store_test_results:
31-
path: app/build/test-results
31+
path: alog/build/test-results
3232

3333
- run:
3434
name: gradlew build

.idea/codeStyles/Project.xml

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

.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/misc.xml

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

.idea/runConfigurations.xml

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

.idea/vcs.xml

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
| | Current Status |
33
|--------|--------|
44
| JitPack | [![](https://jitpack.io/v/AndroidLogData/Logdata-Android.svg)](https://jitpack.io/#AndroidLogData/Logdata-Android) |
5-
| Travis-CI | [![Build Status](https://travis-ci.org/AndroidLogData/Logdata-Android.svg?branch=develop)](https://travis-ci.org/AndroidLogData/Logdata-Android) |
6-
| CircleCI | [![CircleCI](https://circleci.com/gh/AndroidLogData/Logdata-Android.svg?style=svg)](https://circleci.com/gh/AndroidLogData/Logdata-Android) |
5+
| Travis-CI | [![Build Status](https://travis-ci.org/AndroidLogData/ALog.svg?branch=develop)](https://travis-ci.org/AndroidLogData/ALog) |
6+
| CircleCI | [![CircleCI](https://circleci.com/gh/AndroidLogData/ALog/tree/develop.svg?style=svg)](https://circleci.com/gh/AndroidLogData/ALog/tree/develop) |
77

88
안드로이드 로그 데이터 관리를 위한 안드로이드 라이브러리
99

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/build
1+
/build
Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
1-
apply plugin: 'com.android.application'
2-
3-
android {
4-
compileSdkVersion 27
5-
6-
7-
8-
defaultConfig {
9-
applicationId "com.android.logdata.example"
10-
minSdkVersion 21
11-
targetSdkVersion 27
12-
versionCode 1
13-
versionName "1.0"
14-
15-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
16-
17-
}
18-
19-
buildTypes {
20-
release {
21-
minifyEnabled false
22-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
23-
}
24-
}
25-
}
26-
27-
dependencies {
28-
implementation fileTree(dir: 'libs', include: ['*.jar'])
29-
implementation project(':logcat')
30-
implementation 'com.android.support:appcompat-v7:27.1.1'
31-
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
32-
testImplementation 'junit:junit:4.12'
33-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
34-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
35-
}
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 27
5+
6+
defaultConfig {
7+
applicationId "com.bowoon.android.alog_example"
8+
minSdkVersion 21
9+
targetSdkVersion 27
10+
versionCode 1
11+
versionName "1.0"
12+
13+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14+
}
15+
16+
buildTypes {
17+
release {
18+
minifyEnabled false
19+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
20+
}
21+
}
22+
}
23+
24+
dependencies {
25+
implementation fileTree(dir: 'libs', include: ['*.jar'])
26+
27+
implementation 'com.android.support:appcompat-v7:27.1.1'
28+
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
29+
testImplementation 'junit:junit:4.12'
30+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
31+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
32+
33+
implementation project(':alog')
34+
}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
# Add project specific ProGuard rules here.
2-
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
4-
#
5-
# For more details, see
6-
# http://developer.android.com/guide/developing/tools/proguard.html
7-
8-
# If your project uses WebView with JS, uncomment the following
9-
# and specify the fully qualified class name to the JavaScript interface
10-
# class:
11-
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12-
# public *;
13-
#}
14-
15-
# Uncomment this to preserve the line number information for
16-
# debugging stack traces.
17-
#-keepattributes SourceFile,LineNumberTable
18-
19-
# If you keep the line number information, uncomment this to
20-
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
1+
# Add project specific ProGuard rules here.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
4+
#
5+
# For more details, see
6+
# http://developer.android.com/guide/developing/tools/proguard.html
7+
8+
# If your project uses WebView with JS, uncomment the following
9+
# and specify the fully qualified class name to the JavaScript interface
10+
# class:
11+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12+
# public *;
13+
#}
14+
15+
# Uncomment this to preserve the line number information for
16+
# debugging stack traces.
17+
#-keepattributes SourceFile,LineNumberTable
18+
19+
# If you keep the line number information, uncomment this to
20+
# hide the original source file name.
21+
#-renamesourcefileattribute SourceFile

0 commit comments

Comments
 (0)