Skip to content

Commit

Permalink
Remove useless files.
Browse files Browse the repository at this point in the history
  • Loading branch information
ChadCSong committed Nov 13, 2017
1 parent 60cf1ed commit 891075d
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ captures/
# Intellij
*.iml
.idea/workspace.xml

.idea/
# Keystore files
*.jks
8 changes: 1 addition & 7 deletions .idea/gradle.xml

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

10 changes: 0 additions & 10 deletions .idea/libraries/constraint_layout_1_0_2.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/libraries/constraint_layout_solver_1_0_2.xml

This file was deleted.

12 changes: 1 addition & 11 deletions .idea/misc.xml

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

22 changes: 15 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,22 @@ buildscript {
}

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 25
buildToolsVersion '26.0.2'

defaultConfig {
applicationId "com.sackcentury.shinebutton"
minSdkVersion 14
targetSdkVersion 23
targetSdkVersion 25
versionCode 1
versionName "1.0"
jackOptions {
enabled true
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
release {
Expand All @@ -27,9 +34,10 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
// compile 'com.sackcentury:shinebutton:0.1.5'
compile project(path: ':shinebuttonlib')
compile 'com.android.support:appcompat-v7:23.2.1'
compile 'com.sackcentury:shinebutton:0.1.5'
compile 'com.android.support:cardview-v7:23.0.+'
// compile project(path: ':shinebuttonlib')
compile 'com.android.support:cardview-v7:23.0.1'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
testCompile 'junit:junit:4.12'
}
10 changes: 9 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
buildscript {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:3.0.0-rc2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -15,6 +19,10 @@ buildscript {
allprojects {
repositories {
jcenter()
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
}

Expand Down
18 changes: 17 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,20 @@
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# org.gradle.parallel=true
org.gradle.jvmargs=-Xmx1536M
VERSION_NAME=0.1.9
VERSION_CODE=9
POM_GROUP_ID=com.sackcentury
POM_DESCRIPTION=This is a UI lib for Android. Effects like shining.
POM_URL=https://github.com/ChadCSong/ShineButton
POM_SCM_URL=https://github.com/ChadCSong/ShineButton.git
POM_SCM_CONNECTION=scm:[email protected]:ChadCSong/ShineButton.git
POM_SCM_DEV_CONNECTION=scm:[email protected]:ChadCSong/ShineButton.git
POM_LICENCE_NAME=The MIT License (MIT)
POM_LICENCE_URL=https://raw.githubusercontent.com/ChadCSong/ShineButton/master/LICENSE
POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=ChadCSong
POM_DEVELOPER_NAME=Song Chao
POM_INCEPTION_YEAR=2016

4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Aug 26 17:21:13 CST 2016
#Mon Oct 23 17:06:41 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
7 changes: 6 additions & 1 deletion shinebuttonlib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
buildToolsVersion '26.0.2'

defaultConfig {
minSdkVersion 14
targetSdkVersion 23
versionCode 9
versionName "0.1.9"

}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildTypes {
release {
Expand Down
3 changes: 3 additions & 0 deletions shinebuttonlib/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
POM_NAME=ShineButton
POM_ARTIFACT_ID=shinebutton
POM_PACKAGING=aar

0 comments on commit 891075d

Please sign in to comment.