diff --git a/rxlife-x/build.gradle b/rxlife-x/build.gradle new file mode 100644 index 0000000..32ddb7c --- /dev/null +++ b/rxlife-x/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 28 + + defaultConfig { + minSdkVersion 11 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'io.reactivex.rxjava2:rxjava:2.2.8' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' + api 'androidx.lifecycle:lifecycle-common-java8:2.0.0' +} \ No newline at end of file diff --git a/rxlife/proguard-rules.pro b/rxlife-x/proguard-rules.pro similarity index 100% rename from rxlife/proguard-rules.pro rename to rxlife-x/proguard-rules.pro diff --git a/rxlife/src/main/AndroidManifest.xml b/rxlife-x/src/main/AndroidManifest.xml similarity index 100% rename from rxlife/src/main/AndroidManifest.xml rename to rxlife-x/src/main/AndroidManifest.xml diff --git a/rxlife/src/main/java/com/rxjava/rxlife/AbstractLifecycle.java b/rxlife-x/src/main/java/com/rxjava/rxlife/AbstractLifecycle.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/AbstractLifecycle.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/AbstractLifecycle.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/CompletableLife.java b/rxlife-x/src/main/java/com/rxjava/rxlife/CompletableLife.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/CompletableLife.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/CompletableLife.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/FlowableLife.java b/rxlife-x/src/main/java/com/rxjava/rxlife/FlowableLife.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/FlowableLife.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/FlowableLife.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/LifeCompletableObserver.java b/rxlife-x/src/main/java/com/rxjava/rxlife/LifeCompletableObserver.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/LifeCompletableObserver.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/LifeCompletableObserver.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/LifeConditionalSubscriber.java b/rxlife-x/src/main/java/com/rxjava/rxlife/LifeConditionalSubscriber.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/LifeConditionalSubscriber.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/LifeConditionalSubscriber.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/LifeMaybeObserver.java b/rxlife-x/src/main/java/com/rxjava/rxlife/LifeMaybeObserver.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/LifeMaybeObserver.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/LifeMaybeObserver.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/LifeObserver.java b/rxlife-x/src/main/java/com/rxjava/rxlife/LifeObserver.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/LifeObserver.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/LifeObserver.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/LifeSingleObserver.java b/rxlife-x/src/main/java/com/rxjava/rxlife/LifeSingleObserver.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/LifeSingleObserver.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/LifeSingleObserver.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/LifeSubscriber.java b/rxlife-x/src/main/java/com/rxjava/rxlife/LifeSubscriber.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/LifeSubscriber.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/LifeSubscriber.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/MaybeLife.java b/rxlife-x/src/main/java/com/rxjava/rxlife/MaybeLife.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/MaybeLife.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/MaybeLife.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/ObservableLife.java b/rxlife-x/src/main/java/com/rxjava/rxlife/ObservableLife.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/ObservableLife.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/ObservableLife.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/ParallelFlowableLife.java b/rxlife-x/src/main/java/com/rxjava/rxlife/ParallelFlowableLife.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/ParallelFlowableLife.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/ParallelFlowableLife.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/RxConverter.java b/rxlife-x/src/main/java/com/rxjava/rxlife/RxConverter.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/RxConverter.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/RxConverter.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/RxLife.java b/rxlife-x/src/main/java/com/rxjava/rxlife/RxLife.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/RxLife.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/RxLife.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/RxLifeOperator.java b/rxlife-x/src/main/java/com/rxjava/rxlife/RxLifeOperator.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/RxLifeOperator.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/RxLifeOperator.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/RxLifeTransformer.java b/rxlife-x/src/main/java/com/rxjava/rxlife/RxLifeTransformer.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/RxLifeTransformer.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/RxLifeTransformer.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/RxSource.java b/rxlife-x/src/main/java/com/rxjava/rxlife/RxSource.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/RxSource.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/RxSource.java diff --git a/rxlife/src/main/java/com/rxjava/rxlife/SingleLife.java b/rxlife-x/src/main/java/com/rxjava/rxlife/SingleLife.java similarity index 100% rename from rxlife/src/main/java/com/rxjava/rxlife/SingleLife.java rename to rxlife-x/src/main/java/com/rxjava/rxlife/SingleLife.java diff --git a/rxlife/src/main/res/values/strings.xml b/rxlife-x/src/main/res/values/strings.xml similarity index 100% rename from rxlife/src/main/res/values/strings.xml rename to rxlife-x/src/main/res/values/strings.xml diff --git a/rxlife/build.gradle b/rxlife/build.gradle deleted file mode 100644 index d422669..0000000 --- a/rxlife/build.gradle +++ /dev/null @@ -1,100 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion 28 - - defaultConfig { - minSdkVersion 11 - targetSdkVersion 28 - versionCode 1 - versionName "1.0" - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'io.reactivex.rxjava2:rxjava:2.2.8' - implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - api 'android.arch.lifecycle:common-java8:1.1.1' -} - - dependencies { -// dependency { -// groupId 'com.squareup.okhttp3' -// artifactId 'okhttp' -// version '3.10.0' -// scope 'compile' -// } -// dependency { -// groupId 'com.google.code.gson' -// artifactId 'gson' -// version '2.8.2' -// scope 'compile' -// } -// dependency { -// groupId 'io.reactivex.rxjava2' -// artifactId 'rxjava' -// version '2.2.0' -// scope 'compile' -// } -// dependency { -// groupId 'io.reactivex.rxjava2' -// artifactId 'rxandroid' -// version '2.1.0' -// scope 'compile' -// } -// dependency { -// groupId 'com.http.wrapper.httpsender' -// artifactId 'annotation' -// version '1.0.0' -// scope 'compile' -// } - dependency { - groupId 'android.arch.lifecycle' - artifactId 'common-java8' - version '1.1.1' - scope 'compile' - } - } - - scm { - connection gitUrl - developerConnection gitUrl - url siteUrl - } - } - } - } -} - -Properties properties = new Properties() -properties.load(project.rootProject.file('local.properties').newDataInputStream()) -bintray { - user = properties.getProperty("bintray.user") - key = properties.getProperty("bintray.apikey") - configurations = ['archives'] - pkg { - repo = "maven" - name = rootProject.ext.projectName //发布到JCenter上的项目名字 - websiteUrl = siteUrl - vcsUrl = gitUrl - licenses = ["Apache-2.0"] - publish = true - } -} -// ./gradlew install -// ./gradlew bintrayUpload -//更新version 版本信息,然后在项目目录下(不是在模块目录下)执行 ./gradlew bintrayUpload 语句,即可更新到jcenter库上 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index fa48282..7a71d40 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':rxlife' +include ':app', ':rxlife-x'