Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
134 changes: 109 additions & 25 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 55 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Automatically generated file. DO NOT MODIFY
*/
package com.androidnetworking;

public final class BuildConfig {
public static final boolean DEBUG = false;
public static final String APPLICATION_ID = "com.androidnetworking";
public static final String BUILD_TYPE = "release";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 1;
public static final String VERSION_NAME = "1.0";
}
18 changes: 11 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.2.71'
ext.build_version = '3.2.0'
ext.kotlin_version = '1.3.72'
ext.build_version = '3.4.1'
repositories {
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
google()
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:$build_version"
classpath "com.android.tools.build:gradle:4.0.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -17,6 +21,10 @@ buildscript {

allprojects {
repositories {
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }
maven { url 'http://maven.aliyun.com/nexus/content/repositories/google' }
maven { url 'http://maven.aliyun.com/nexus/content/repositories/gradle-plugin' }
google()
jcenter()
maven { url "https://jitpack.io" }
Expand Down Expand Up @@ -67,10 +75,6 @@ support.supportV4 = "com.android.support:support-v4:$versions.support"
support.recyclerView = "com.android.support:recyclerview-v7:$versions.support"
deps.support = support

def databinding = [:]
databinding.compiler = "com.android.databinding:compiler:$versions.android_plugin_version"
deps.databinding = databinding

def lifecycle = [:]
lifecycle.runtime = "android.arch.lifecycle:runtime:$versions.lifecycle"
lifecycle.extensions = "android.arch.lifecycle:extensions:$versions.lifecycle"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
18 changes: 12 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 27
defaultConfig {
minSdkVersion 17
minSdkVersion 21
targetSdkVersion 27
versionCode 1
versionName "1.0"
Expand All @@ -16,12 +16,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
dataBinding {
enabled = true
buildFeatures {
dataBinding = true
}
/*tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:deprecation"
}*/
android.libraryVariants.all { variant ->
variant.outputs.all { output->
outputFileName = "${project.name}-v7-${defaultConfig.versionName}-${variant.buildType.name}.aar"
}
}

}

dependencies {
Expand All @@ -31,21 +37,21 @@ dependencies {
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation deps.kotlin.jdk
implementation deps.kotlin.ktx
//implementation deps.kotlin.ktx
implementation deps.kotlin.coroutines

implementation deps.support.recyclerView
implementation deps.support.appcompatV7
implementation deps.support.supportV4
implementation deps.view.constraintLayout
implementation 'com.android.support.constraint:constraint-layout:2.0.4'

// RxJava
implementation deps.rx.rxJava
implementation deps.rx.rxAndroid
implementation deps.rx.rxKotlin

//
implementation deps.pinyin4j
implementation 'com.belerweb:pinyin4j:2.5.1'
implementation 'com.yanzhenjie:loading:1.0.2'
}
repositories {
Expand Down
Loading