diff --git a/app/build.gradle b/app/build.gradle index 5ee223d..450369f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' -apply plugin: 'android-apt' +//apply plugin: 'android-apt' android { compileSdkVersion 24 - buildToolsVersion "24.0.3" + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.demo.maat.hello_rxjava" minSdkVersion 16 @@ -20,16 +20,15 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + compile fileTree(include: ['*.jar'], dir: 'libs') androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) + //noinspection GradleCompatible compile 'com.android.support:appcompat-v7:24.2.1' testCompile 'junit:junit:4.12' - - compile 'com.jakewharton:butterknife:8.4.0' - apt 'com.jakewharton:butterknife-compiler:8.4.0' - + //compile 'com.jakewharton:butterknife:8.4.0' + //apt 'com.jakewharton:butterknife-compiler:8.4.0' compile 'io.reactivex:rxandroid:1.0.1' // Because RxAndroid releases are few and far between, it is recommended you also // explicitly depend on RxJava's latest version for bug fixes and new features. @@ -41,6 +40,8 @@ dependencies { compile 'com.squareup.retrofit2:converter-gson:+' compile 'com.squareup.retrofit2:adapter-rxjava:+' compile 'com.google.code.gson:gson:+' - compile 'io.reactivex:rxandroid:1.2.1' + //implementation 'com.jakewharton:butterknife:5.1.1' + compile 'com.jakewharton:butterknife:8.5.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'//添加这里 } diff --git a/app/src/main/java/com/demo/maat/hello_rxjava/MainActivity.java b/app/src/main/java/com/demo/maat/hello_rxjava/MainActivity.java index 92769c4..3ae19a7 100644 --- a/app/src/main/java/com/demo/maat/hello_rxjava/MainActivity.java +++ b/app/src/main/java/com/demo/maat/hello_rxjava/MainActivity.java @@ -14,7 +14,7 @@ public class MainActivity extends AppCompatActivity { - @Nullable @BindView(R.id.btn_rxjava) + @BindView(R.id.btn_rxjava) Button mBtnRxjava; @BindView(R.id.btn_retrofit) Button mBtnRetrofit; diff --git a/app/src/main/java/com/demo/maat/hello_rxjava/retrofit/ZhihuApi.java b/app/src/main/java/com/demo/maat/hello_rxjava/retrofit/ZhihuApi.java old mode 100755 new mode 100644 diff --git a/app/src/main/java/com/demo/maat/hello_rxjava/retrofit/zhihu/ZhihuDaily.java b/app/src/main/java/com/demo/maat/hello_rxjava/retrofit/zhihu/ZhihuDaily.java old mode 100755 new mode 100644 diff --git a/app/src/main/java/com/demo/maat/hello_rxjava/retrofit/zhihu/ZhihuDailyItem.java b/app/src/main/java/com/demo/maat/hello_rxjava/retrofit/zhihu/ZhihuDailyItem.java old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/debounce_activity_main.xml b/app/src/main/res/layout/debounce_activity_main.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/debounce_fragment.xml b/app/src/main/res/layout/debounce_fragment.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/operator1_activity_main.xml b/app/src/main/res/layout/operator1_activity_main.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/operator2_activity_main.xml b/app/src/main/res/layout/operator2_activity_main.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/operators1_fragment.xml b/app/src/main/res/layout/operators1_fragment.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/operators2_fragment.xml b/app/src/main/res/layout/operators2_fragment.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/polling_activity_main.xml b/app/src/main/res/layout/polling_activity_main.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/polling_fragment.xml b/app/src/main/res/layout/polling_fragment.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/retrofit_fragment.xml b/app/src/main/res/layout/retrofit_fragment.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/rxandroid_fragment.xml b/app/src/main/res/layout/rxandroid_fragment.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/scheduler_activity_main.xml b/app/src/main/res/layout/scheduler_activity_main.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/layout/scheduler_fragment.xml b/app/src/main/res/layout/scheduler_fragment.xml old mode 100755 new mode 100644 diff --git a/app/src/main/res/values-w820dp/fragmentview_strings.xml b/app/src/main/res/values-w820dp/fragmentview_strings.xml old mode 100755 new mode 100644 diff --git a/build.gradle b/build.gradle index 5a80b7d..46bbdbc 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,9 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' + classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1' + //classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle.properties b/gradle.properties index aac7c9b..a1cee82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,18 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - +## Project-wide Gradle settings. +# # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m - +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# # 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 +#Tue Oct 25 17:15:42 CST 2016 +systemProp.http.proxyHost=hx.gy +org.gradle.jvmargs=-Xmx1536m +systemProp.http.proxyPort=1080 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..d894056 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Fri Nov 03 10:50:25 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/gradlew b/gradlew old mode 100755 new mode 100644