Skip to content

Commit

Permalink
optimize multi server
Browse files Browse the repository at this point in the history
  • Loading branch information
yangsen committed Nov 17, 2022
1 parent be449af commit c101411
Show file tree
Hide file tree
Showing 18 changed files with 155 additions and 218 deletions.
3 changes: 1 addition & 2 deletions .idea/gradle.xml

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

8 changes: 5 additions & 3 deletions .idea/misc.xml

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

7 changes: 5 additions & 2 deletions .idea/modules.xml

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

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

19 changes: 0 additions & 19 deletions HappyDns_Android.iml

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.2'
classpath 'com.android.tools.build:gradle:3.6.4'
// classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ POM_LICENCE_DIST=repo

POM_DEVELOPER_ID=qiniu
POM_DEVELOPER_NAME=Qiniu

android.useAndroidX=true
24 changes: 15 additions & 9 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import java.util.regex.Matcher
apply plugin: 'com.android.library'

def versionName() {
String config = 'library/src/main/java/com/qiniu/android/dns/Version.java'
String config = getProjectDir().getPath() + '/src/main/java/com/qiniu/android/dns/Version.java'
String fileContents = new File(config).text
Matcher myMatcher = fileContents =~ /VERSION = "(.+)";/
String version = myMatcher[0][1]
Expand All @@ -20,12 +20,12 @@ String version = versionName()
int code = versionNameToCode(version)

android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion 30
buildToolsVersion '30.0.3'
defaultConfig {
//applicationId "com.qiniu.android.dns"
minSdkVersion 9
targetSdkVersion 27
minSdkVersion 14
targetSdkVersion 30
versionCode code
versionName version
}
Expand Down Expand Up @@ -53,10 +53,16 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation 'com.android.support.test:runner:0.4.1'
androidTestImplementation 'com.android.support.test:rules:0.4.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:2.2.1'

androidTestCompileOnly project(path: ':library')

androidTestImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
androidTestImplementation 'androidx.test:core:1.5.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation "com.android.support:support-annotations:28.0.0"
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
}

task releaseJar(type: Jar, dependsOn: 'build') {
Expand Down
112 changes: 0 additions & 112 deletions library/library.iml

This file was deleted.

Loading

0 comments on commit c101411

Please sign in to comment.