-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master'
- Loading branch information
Showing
4 changed files
with
106 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,68 @@ | ||
| apply plugin: 'com.android.application' | ||
|
|
||
| android { | ||
| compileSdkVersion 32 | ||
| buildToolsVersion '30.0.0' | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.hss01248.dialogutildemo" | ||
| minSdkVersion 19 | ||
| targetSdkVersion 32 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| multiDexEnabled true | ||
| } | ||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| debug { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||
| targetCompatibility JavaVersion.VERSION_1_8 | ||
| } | ||
| } | ||
|
|
||
|
|
||
| repositories { | ||
| jcenter(); | ||
| flatDir { | ||
| dirs 'libs' | ||
| } | ||
| mavenCentral(); | ||
| maven { | ||
| url "https://jitpack.io" | ||
| }; | ||
|
|
||
| maven { | ||
| url "http://dl.bintray.com/lukaville/maven" | ||
| } | ||
|
|
||
|
|
||
| /* maven { url "http://dl.bintray.com/dodola/maven" }*/ | ||
| } | ||
| dependencies { | ||
| compile fileTree(dir: 'libs', include: ['*.jar']) | ||
| testCompile 'junit:junit:4.12' | ||
| implementation 'androidx.appcompat:appcompat:1.0.0' | ||
| implementation 'androidx.recyclerview:recyclerview:1.0.0' | ||
| implementation 'com.google.android.material:material:1.0.0' | ||
| compile 'com.jakewharton:butterknife:10.2.1' | ||
| annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' | ||
| //compile 'com.github.rubensousa:BottomSheetBuilder:1.3' | ||
| compile project(path: ':dialog') | ||
| debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' | ||
| releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' | ||
| compile 'com.github.hss01248:Mylog:1.0.1' | ||
| compile 'com.alibaba:fastjson:1.1.54.android' | ||
| } | ||
| apply plugin: 'com.android.application' | ||
|
|
||
| android { | ||
| compileSdkVersion 32 | ||
| buildToolsVersion '30.0.0' | ||
|
|
||
| defaultConfig { | ||
| applicationId "com.hss01248.dialogutildemo" | ||
| minSdkVersion 19 | ||
| targetSdkVersion 32 | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| multiDexEnabled true | ||
| } | ||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| debug { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||
| targetCompatibility JavaVersion.VERSION_1_8 | ||
| } | ||
| } | ||
|
|
||
|
|
||
| repositories { | ||
| jcenter(); | ||
| flatDir { | ||
| dirs 'libs' | ||
| } | ||
| mavenCentral(); | ||
| maven { | ||
| url "https://jitpack.io" | ||
| }; | ||
|
|
||
| maven { | ||
| url "http://dl.bintray.com/lukaville/maven" | ||
| } | ||
|
|
||
|
|
||
| /* maven { url "http://dl.bintray.com/dodola/maven" }*/ | ||
| } | ||
| dependencies { | ||
| compile fileTree(dir: 'libs', include: ['*.jar']) | ||
| testCompile 'junit:junit:4.12' | ||
| implementation 'androidx.appcompat:appcompat:1.0.0' | ||
| implementation 'androidx.recyclerview:recyclerview:1.0.0' | ||
| implementation 'com.google.android.material:material:1.0.0' | ||
| compile 'com.jakewharton:butterknife:10.2.1' | ||
| annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' | ||
| //compile 'com.github.rubensousa:BottomSheetBuilder:1.3' | ||
| compile project(path: ':dialog') | ||
| //debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' | ||
| // releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' | ||
| compile 'com.github.hss01248:Mylog:1.0.1' | ||
| compile 'com.alibaba:fastjson:1.1.54.android' | ||
| } | ||
|
|
||
| configurations { | ||
| //all*.exclude group: 'com.github.hss01248.flipperUtil' | ||
| all*.exclude group: 'com.github.hss01248', module: 'DialogUtil' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,15 @@ | ||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
| buildscript { | ||
| apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/dev/remote3.gradle' | ||
| apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/master/deps/depsLastestChecker.gradle' | ||
| apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/dev/z_config/git_branch_info.gradle' | ||
| repositories { | ||
|
|
||
| mavenCentral() | ||
| google() | ||
| jcenter() | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:4.1.0' | ||
|
|
||
| // NOTE: Do not place your application dependencies here; they belong | ||
| // in the individual module build.gradle files | ||
| } | ||
| } | ||
| allprojects { | ||
| repositories { | ||
| mavenCentral() | ||
| google() | ||
| jcenter() | ||
| maven { url "https://jitpack.io" } | ||
| } | ||
| } | ||
|
|
||
| // Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
| buildscript { | ||
| apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/dev/remote3.gradle' | ||
| apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/master/deps/depsLastestChecker.gradle' | ||
| apply from: 'https://raw.githubusercontent.com/hss01248/flipperUtil/dev/z_config/git_branch_info.gradle' | ||
|
|
||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:4.1.0' | ||
|
|
||
| // NOTE: Do not place your application dependencies here; they belong | ||
| // in the individual module build.gradle files | ||
| } | ||
| } | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,23 @@ | ||
| # Project-wide Gradle settings. | ||
|
|
||
| # IDE (e.g. Android Studio) users: | ||
| # Gradle settings configured through the IDE *will override* | ||
| # any settings specified in this file. | ||
|
|
||
| # 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. | ||
| # 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 | ||
| android.enableJetifier=true | ||
| android.useAndroidX=true | ||
| org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 | ||
| # Project-wide Gradle settings. | ||
|
|
||
| # IDE (e.g. Android Studio) users: | ||
| # Gradle settings configured through the IDE *will override* | ||
| # any settings specified in this file. | ||
|
|
||
| # 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. | ||
| # 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 | ||
| android.enableJetifier=true | ||
| android.useAndroidX=true | ||
| org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 | ||
| flipper_use_leakcanary=true | ||
| flipper_alert_dialog_like_ios=true |