Skip to content

Commit f8293c1

Browse files
authored
Merge pull request #371 from jpush/dev
Dev
2 parents 243d5a0 + 02cd99f commit f8293c1

32 files changed

+1
-59243
lines changed

example/android/app/assets/index.android.bundle

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

example/android/app/build.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,6 @@ android {
108108
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
109109
}
110110
}
111-
sourceSets {
112-
main {
113-
manifest.srcFile 'AndroidManifest.xml'
114-
jniLibs.srcDirs = ['libs']
115-
java.srcDirs = ['src']
116-
aidl.srcDirs = ['src']
117-
resources.srcDirs = ['src']
118-
res.srcDirs = ['res']
119-
assets.srcDirs = ['assets']
120-
}
121-
}
122111
// applicationVariants are e.g. debug, release
123112
applicationVariants.all { variant ->
124113
variant.outputs.each { output ->
File renamed without changes.

example/android/app/src/com/pushdemo/MainActivity.java renamed to example/android/app/src/main/java/com/pushdemo/MainActivity.java

File renamed without changes.

example/android/app/src/com/pushdemo/MainApplication.java renamed to example/android/app/src/main/java/com/pushdemo/MainApplication.java

File renamed without changes.

example/android/app/src/com/pushdemo/SecondActivity.java renamed to example/android/app/src/main/java/com/pushdemo/SecondActivity.java

File renamed without changes.

example/android/app/res/drawable-hdpi/border_bg.9.png renamed to example/android/app/src/main/res/drawable-hdpi/border_bg.9.png

File renamed without changes.

example/android/app/res/drawable-hdpi/bottom_bg.9.png renamed to example/android/app/src/main/res/drawable-hdpi/bottom_bg.9.png

File renamed without changes.

example/android/app/res/drawable-hdpi/corners_bg.xml renamed to example/android/app/src/main/res/drawable-hdpi/corners_bg.xml

File renamed without changes.

example/android/app/res/drawable-hdpi/ic_launcher.png renamed to example/android/app/src/main/res/drawable-hdpi/ic_launcher.png

File renamed without changes.

0 commit comments

Comments
 (0)