Skip to content

Commit 0ee3bf1

Browse files
committed
push jcenter
1 parent 2306381 commit 0ee3bf1

File tree

18 files changed

+122
-17
lines changed

18 files changed

+122
-17
lines changed

.idea/gradle.xml

Lines changed: 22 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: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.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/vcs.xml

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

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@
1414
android:label = "@string/app_name"
1515
android:theme = "@style/AppTheme.NoActionBar"
1616
>
17-
</activity >
18-
<activity android:name = ".activity.Activity_JINI" >
19-
</activity >
20-
<activity android:name = ".activity.Main3Activity" >
2117
<intent-filter >
2218
<action android:name = "android.intent.action.MAIN" />
2319

2420
<category android:name = "android.intent.category.LAUNCHER" />
2521

2622
</intent-filter >
2723
</activity >
24+
<activity android:name = ".activity.Activity_JINI" >
25+
</activity >
26+
<activity android:name = ".activity.Main3Activity" >
27+
28+
</activity >
2829
</application >
2930

3031
</manifest >

build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.1.0-beta1'
7+
classpath 'com.android.tools.build:gradle:2.1.0'
8+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
810

911
// classpath 'com.android.tools.build:gradle:1.3.1'
1012
// NOTE: Do not place your application dependencies here; they belong
@@ -20,8 +22,4 @@ task clean(type: Delete) {
2022
delete rootProject.buildDir
2123
}
2224

23-
android {
24-
compileSdkVersion 23
25-
}
26-
dependencies {
27-
}
25+
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Feb 25 10:25:49 CST 2016
1+
#Wed Jun 15 22:23:27 CST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
0 Bytes
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
incremental task execution

0 commit comments

Comments
 (0)