diff --git a/app/build.gradle b/app/build.gradle index ce3b89e..41dbcc6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,5 +39,5 @@ dependencies { implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.45-androidx' implementation 'com.afollestad.material-dialogs:core:3.0.0-rc4' implementation 'com.afollestad.material-dialogs:files:3.0.0-rc4' - implementation project(path: ':library') + implementation project(path: ':ktx') } diff --git a/build.gradle b/build.gradle index af61924..c6d0753 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.novoda:bintray-release:0.9' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/library/.gitignore b/ktx/.gitignore similarity index 100% rename from library/.gitignore rename to ktx/.gitignore diff --git a/ktx/build.gradle b/ktx/build.gradle new file mode 100644 index 0000000..859de9e --- /dev/null +++ b/ktx/build.gradle @@ -0,0 +1,109 @@ +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-android' +apply plugin: 'com.novoda.bintray-release' + +android { + compileSdkVersion 28 + + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + api 'androidx.appcompat:appcompat:1.1.0-beta01' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + api "androidx.core:core-ktx:1.2.0-alpha02" + api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + api 'com.afollestad.material-dialogs:core:3.0.0-rc4' + api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1" + api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-alpha01" + api 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha01' + api 'androidx.recyclerview:recyclerview:1.1.0-alpha06' +} + +repositories { + mavenCentral() +} + + +if (project.hasProperty("kotlin")) { + // Disable creating javadocs + tasks.withType(Javadoc) { + enabled = false + } +} + +//生成源文件 +task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + classifier = 'sources' +} + +//生成Javadoc文档 +task javadoc(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) +} + +//文档打包成jar +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +//拷贝javadoc文件 +task copyDoc(type: Copy) { + from "${buildDir}/docs/" + into "docs" +} + +//上传到JCenter所需要的源码文件 +artifacts { + archives javadocJar + archives sourcesJar +} + +//解决 JavaDoc 中文注释生成失败的问题 +tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + options.addStringOption('encoding', 'UTF-8') + options.addStringOption('charSet', 'UTF-8') +} + + +//发布到 Bintray +publish { + + userOrg = 'lulululbj' //bintray.com 注册的用户名 + groupId = 'luyao.util.ktx' //以后访问 jcenter上此项目的路径,一般和库项目的包名一致 + artifactId = 'AndroidUtilKTX' //bintray.com 创建的 Package 名 + publishVersion = '0.0.1' //版本号 + desc = 'temp version' //版本说明,随意 + website = 'https://github.com/lulululbj/AndroidUtilCodeKTX' //关于这个开源项目的网站,随意 +} \ No newline at end of file diff --git a/library/proguard-rules.pro b/ktx/proguard-rules.pro similarity index 100% rename from library/proguard-rules.pro rename to ktx/proguard-rules.pro diff --git a/library/src/androidTest/java/luyao/util/ktx/ExampleInstrumentedTest.java b/ktx/src/androidTest/java/luyao/util/ktx/ExampleInstrumentedTest.java similarity index 100% rename from library/src/androidTest/java/luyao/util/ktx/ExampleInstrumentedTest.java rename to ktx/src/androidTest/java/luyao/util/ktx/ExampleInstrumentedTest.java diff --git a/library/src/main/AndroidManifest.xml b/ktx/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to ktx/src/main/AndroidManifest.xml diff --git a/ktx/src/main/java/luyao/util/ktx/KtxApp.kt b/ktx/src/main/java/luyao/util/ktx/KtxApp.kt new file mode 100644 index 0000000..51384ca --- /dev/null +++ b/ktx/src/main/java/luyao/util/ktx/KtxApp.kt @@ -0,0 +1,16 @@ +package luyao.util.ktx + +import android.app.Application + +/** + * Created by luyao + * on 2019/6/19 10:53 + */ +class KtxApp : Application() { + + override fun onCreate() { + super.onCreate() + + + } +} \ No newline at end of file diff --git a/library/src/main/java/luyao/util/ktx/base/BaseActivity.kt b/ktx/src/main/java/luyao/util/ktx/base/BaseActivity.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/base/BaseActivity.kt rename to ktx/src/main/java/luyao/util/ktx/base/BaseActivity.kt diff --git a/library/src/main/java/luyao/util/ktx/base/BaseFragment.kt b/ktx/src/main/java/luyao/util/ktx/base/BaseFragment.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/base/BaseFragment.kt rename to ktx/src/main/java/luyao/util/ktx/base/BaseFragment.kt diff --git a/library/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt b/ktx/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt rename to ktx/src/main/java/luyao/util/ktx/base/BaseVMActivity.kt diff --git a/library/src/main/java/luyao/util/ktx/base/BaseVMFragment.kt b/ktx/src/main/java/luyao/util/ktx/base/BaseVMFragment.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/base/BaseVMFragment.kt rename to ktx/src/main/java/luyao/util/ktx/base/BaseVMFragment.kt diff --git a/library/src/main/java/luyao/util/ktx/base/BaseViewModel.kt b/ktx/src/main/java/luyao/util/ktx/base/BaseViewModel.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/base/BaseViewModel.kt rename to ktx/src/main/java/luyao/util/ktx/base/BaseViewModel.kt diff --git a/library/src/main/java/luyao/util/ktx/bean/AppInfo.kt b/ktx/src/main/java/luyao/util/ktx/bean/AppInfo.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/bean/AppInfo.kt rename to ktx/src/main/java/luyao/util/ktx/bean/AppInfo.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/AppExt.kt b/ktx/src/main/java/luyao/util/ktx/ext/AppExt.kt similarity index 88% rename from library/src/main/java/luyao/util/ktx/ext/AppExt.kt rename to ktx/src/main/java/luyao/util/ktx/ext/AppExt.kt index 78143b5..07b3e0d 100644 --- a/library/src/main/java/luyao/util/ktx/ext/AppExt.kt +++ b/ktx/src/main/java/luyao/util/ktx/ext/AppExt.kt @@ -20,9 +20,9 @@ fun Context.getAppInfo(apkPath: String): AppInfo { val packageName = packageInfo.packageName val appName =packageManager.getApplicationLabel(packageInfo.applicationInfo).toString() val versionName = packageInfo.versionName - val versionCode = packageInfo.longVersionCode + val versionCode = packageInfo.versionCode val icon = packageManager.getApplicationIcon(packageInfo.applicationInfo) - return AppInfo(apkPath,packageName,versionName,versionCode,appName,icon) + return AppInfo(apkPath,packageName,versionName, versionCode.toLong(),appName,icon) } fun Context.getAppInfos(apkFolderPath:String):List{ diff --git a/library/src/main/java/luyao/util/ktx/ext/CommonExt.kt b/ktx/src/main/java/luyao/util/ktx/ext/CommonExt.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/CommonExt.kt rename to ktx/src/main/java/luyao/util/ktx/ext/CommonExt.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/HashExt.kt b/ktx/src/main/java/luyao/util/ktx/ext/HashExt.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/HashExt.kt rename to ktx/src/main/java/luyao/util/ktx/ext/HashExt.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/IntentExt.kt b/ktx/src/main/java/luyao/util/ktx/ext/IntentExt.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/IntentExt.kt rename to ktx/src/main/java/luyao/util/ktx/ext/IntentExt.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/RecycleViewExt.kt b/ktx/src/main/java/luyao/util/ktx/ext/RecycleViewExt.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/RecycleViewExt.kt rename to ktx/src/main/java/luyao/util/ktx/ext/RecycleViewExt.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/ToastExt.kt b/ktx/src/main/java/luyao/util/ktx/ext/ToastExt.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/ToastExt.kt rename to ktx/src/main/java/luyao/util/ktx/ext/ToastExt.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/TransformExt.kt b/ktx/src/main/java/luyao/util/ktx/ext/TransformExt.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/TransformExt.kt rename to ktx/src/main/java/luyao/util/ktx/ext/TransformExt.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/permission/KtxPermissionFragment.kt b/ktx/src/main/java/luyao/util/ktx/ext/permission/KtxPermissionFragment.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/permission/KtxPermissionFragment.kt rename to ktx/src/main/java/luyao/util/ktx/ext/permission/KtxPermissionFragment.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/permission/PermissionExt.kt b/ktx/src/main/java/luyao/util/ktx/ext/permission/PermissionExt.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/permission/PermissionExt.kt rename to ktx/src/main/java/luyao/util/ktx/ext/permission/PermissionExt.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/permission/PermissionRequest.kt b/ktx/src/main/java/luyao/util/ktx/ext/permission/PermissionRequest.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/permission/PermissionRequest.kt rename to ktx/src/main/java/luyao/util/ktx/ext/permission/PermissionRequest.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/permission/PermissionsCallback.kt b/ktx/src/main/java/luyao/util/ktx/ext/permission/PermissionsCallback.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/permission/PermissionsCallback.kt rename to ktx/src/main/java/luyao/util/ktx/ext/permission/PermissionsCallback.kt diff --git a/library/src/main/java/luyao/util/ktx/ext/permission/PermissionsMap.kt b/ktx/src/main/java/luyao/util/ktx/ext/permission/PermissionsMap.kt similarity index 100% rename from library/src/main/java/luyao/util/ktx/ext/permission/PermissionsMap.kt rename to ktx/src/main/java/luyao/util/ktx/ext/permission/PermissionsMap.kt diff --git a/library/src/main/res/values/strings.xml b/ktx/src/main/res/values/strings.xml similarity index 100% rename from library/src/main/res/values/strings.xml rename to ktx/src/main/res/values/strings.xml diff --git a/library/src/main/res/xml/filepaths.xml b/ktx/src/main/res/xml/filepaths.xml similarity index 100% rename from library/src/main/res/xml/filepaths.xml rename to ktx/src/main/res/xml/filepaths.xml diff --git a/library/src/test/java/luyao/util/ktx/ExampleUnitTest.java b/ktx/src/test/java/luyao/util/ktx/ExampleUnitTest.java similarity index 100% rename from library/src/test/java/luyao/util/ktx/ExampleUnitTest.java rename to ktx/src/test/java/luyao/util/ktx/ExampleUnitTest.java diff --git a/library/build.gradle b/library/build.gradle deleted file mode 100644 index 3a31f23..0000000 --- a/library/build.gradle +++ /dev/null @@ -1,54 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion 28 - - - defaultConfig { - minSdkVersion 15 - targetSdkVersion 28 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'androidx.appcompat:appcompat:1.1.0-beta01' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - api "androidx.core:core-ktx:1.2.0-alpha02" - api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - api 'com.afollestad.material-dialogs:core:3.0.0-rc4' - api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.1" - api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0-alpha01" - api 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha01' - implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06' - implementation 'com.jeremyliao:live-event-bus-x:1.4.4' - - -} - -repositories { - mavenCentral() -} diff --git a/library/src/main/java/luyao/util/ktx/KtxApp.kt b/library/src/main/java/luyao/util/ktx/KtxApp.kt deleted file mode 100644 index 5b73c16..0000000 --- a/library/src/main/java/luyao/util/ktx/KtxApp.kt +++ /dev/null @@ -1,21 +0,0 @@ -package luyao.util.ktx - -import android.app.Application -import com.jeremyliao.liveeventbus.LiveEventBus - -/** - * Created by luyao - * on 2019/6/19 10:53 - */ -class KtxApp : Application() { - - override fun onCreate() { - super.onCreate() - - LiveEventBus.get() - .config() - .supportBroadcast(this) - .lifecycleObserverAlwaysActive(true) - .autoClear(false) - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 3306997..fa800ae 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':library' +include ':app', ':ktx'