diff --git a/.gitignore b/.gitignore
index f6b286c..731cb00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,6 @@ captures/
# Intellij
*.iml
.idea/workspace.xml
-
+.idea/
# Keystore files
*.jks
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2509d0e..85199ab 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,13 +13,7 @@
-
+
diff --git a/.idea/libraries/constraint_layout_1_0_2.xml b/.idea/libraries/constraint_layout_1_0_2.xml
deleted file mode 100644
index 5279b35..0000000
--- a/.idea/libraries/constraint_layout_1_0_2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/constraint_layout_solver_1_0_2.xml b/.idea/libraries/constraint_layout_solver_1_0_2.xml
deleted file mode 100644
index 3d873b4..0000000
--- a/.idea/libraries/constraint_layout_solver_1_0_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 264e400..4a16336 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,17 +43,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 722c5cd..9e1cd7f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -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 {
@@ -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'
}
diff --git a/build.gradle b/build.gradle
index 77ce66e..f5ee59d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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
@@ -15,6 +19,10 @@ buildscript {
allprojects {
repositories {
jcenter()
+ maven {
+ url 'https://maven.google.com/'
+ name 'Google'
+ }
}
}
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..db3ad99 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -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
\ No newline at end of file
+# 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:git@github.com:ChadCSong/ShineButton.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com: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
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eae8d70..44b1c0a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/shinebuttonlib/build.gradle b/shinebuttonlib/build.gradle
index 9dc0e37..f384cb9 100644
--- a/shinebuttonlib/build.gradle
+++ b/shinebuttonlib/build.gradle
@@ -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 {
diff --git a/shinebuttonlib/gradle.properties b/shinebuttonlib/gradle.properties
new file mode 100644
index 0000000..1d1ec2d
--- /dev/null
+++ b/shinebuttonlib/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=ShineButton
+POM_ARTIFACT_ID=shinebutton
+POM_PACKAGING=aar
\ No newline at end of file