Skip to content

Commit c4729a0

Browse files
TommyTommy
Tommy
authored and
Tommy
committed
Android：升级 SDK 版本至 29；迁移两个工具类至 util 包
1 parent 20788ce commit c4729a0

File tree

10 files changed

+43
-32
lines changed

10 files changed

+43
-32
lines changed

‎APIJSON-Android/APIJSONApp/APIJSONLibrary/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion '23.0.2'
4+
compileSdkVersion 29
5+
buildToolsVersion '29.0.0'
66
defaultConfig {
7-
minSdkVersion 15
7+
minSdkVersion 20
88
targetSdkVersion 22
99
versionCode 1
1010
versionName "1.0"

‎APIJSON-Android/APIJSONApp/QRCodeLibrary/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion '23.0.2'
4+
compileSdkVersion 29
5+
buildToolsVersion '29.0.0'
66
defaultConfig {
7-
minSdkVersion 15
7+
minSdkVersion 20
88
targetSdkVersion 22
99
versionCode 1
1010
versionName "1.0"

‎APIJSON-Android/APIJSONApp/ZBLibrary/build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.2"
4+
compileSdkVersion 29
5+
buildToolsVersion '29.0.0'
66
defaultConfig {
7-
minSdkVersion 15
7+
minSdkVersion 20
88
targetSdkVersion 22
99
versionCode 1
1010
versionName "1.0"
@@ -28,4 +28,5 @@ dependencies {
2828
compile files('libs/okio-1.0.0.jar')
2929
compile files('libs/universal-image-loader-1.9.4.jar')
3030
compile project(':APIJSONLibrary')
31+
// compile 'com.github.APIJSON:apijson-orm:3.9.0'
3132
}

‎APIJSON-Android/APIJSONApp/ZBLibrary/src/main/res/values/ids.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<item name="lvBaseList" type="id">false</item>
5-
<item name="tvBaseTitle" type="id">false</item>
6-
<item name="pbBaseTitle" type="id">false</item>
7-
<item name="tvBaseTabTitle" type="id">false</item>
8-
<item name="ivBaseTabReturn" type="id">false</item>
9-
<item name="tvBaseTabReturn" type="id">false</item>
10-
<item name="llBaseTabTopRightButtonContainer" type="id">false</item>
11-
<item name="llBaseTabTabContainer" type="id">false</item>
12-
<item name="flBaseTabFragmentContainer" type="id">false</item>
13-
<item name="vBaseBottomWindowRoot" type="id">false</item>
14-
<item name="llBaseViewBottomWindowContainer" type="id">false</item>
15-
<item name="tvBaseViewBottomWindowReturn" type="id">false</item>
16-
<item name="tvBaseViewBottomWindowForward" type="id">false</item>
4+
<item name="lvBaseList" type="id" />
5+
<item name="tvBaseTitle" type="id" />
6+
<item name="pbBaseTitle" type="id" />
7+
<item name="tvBaseTabTitle" type="id" />
8+
<item name="ivBaseTabReturn" type="id" />
9+
<item name="tvBaseTabReturn" type="id" />
10+
<item name="llBaseTabTopRightButtonContainer" type="id" />
11+
<item name="llBaseTabTabContainer" type="id" />
12+
<item name="flBaseTabFragmentContainer" type="id" />
13+
<item name="vBaseBottomWindowRoot" type="id" />
14+
<item name="llBaseViewBottomWindowContainer" type="id" />
15+
<item name="tvBaseViewBottomWindowReturn" type="id" />
16+
<item name="tvBaseViewBottomWindowForward" type="id" />
1717

1818
</resources>

‎APIJSON-Android/APIJSONApp/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
compileSdkVersion 23
9-
buildToolsVersion '23.0.2'
8+
compileSdkVersion 29
9+
buildToolsVersion '29.0.0'
1010
defaultConfig {
11-
applicationId "apijson.demo.client"
12-
minSdkVersion 15
13-
targetSdkVersion 23
11+
minSdkVersion 20
12+
targetSdkVersion 22
1413
versionCode 1
1514
versionName "1.0"
15+
applicationId "apijson.demo.client"
1616
}
1717
buildTypes {
1818
release {

‎APIJSON-Android/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/MainTabActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import apijson.demo.client.model.User;
3232
import apijson.demo.client.util.ActionUtil;
3333
import apijson.demo.client.util.HttpRequest;
34+
import apijson.demo.client.util.TestRequestAndResponseJava;
35+
import apijson.demo.client.util.TestRequestAndResponseKt;
3436
import zuo.biao.apijson.JSON;
3537
import zuo.biao.apijson.JSONResponse;
3638
import zuo.biao.library.base.BaseBroadcastReceiver;

APIJSON-Android/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/TestRequestAndResponse.kt renamed to APIJSON-Android/APIJSONApp/app/src/main/java/apijson/demo/client/util/TestRequestAndResponse.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package apijson.demo.client.activity_fragment
1+
package apijson.demo.client.util
22

33
import apijson.demo.client.model.Comment
44
import apijson.demo.client.model.CommentItem

APIJSON-Android/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/TestRequestAndResponseJava.java renamed to APIJSON-Android/APIJSONApp/app/src/main/java/apijson/demo/client/util/TestRequestAndResponseJava.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package apijson.demo.client.activity_fragment;
1+
package apijson.demo.client.util;
22

33
import com.alibaba.fastjson.JSONArray;
44
import com.alibaba.fastjson.JSONObject;

‎APIJSON-Android/APIJSONApp/build.gradle‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ buildscript {
44
ext.kotlin_version = '1.2.50'
55
repositories {
66
jcenter()
7+
maven {
8+
url 'https://maven.google.com/'
9+
name 'Google'
10+
}
711
}
812
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.1.2'
13+
classpath 'com.android.tools.build:gradle:3.0.0'
1014
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1115

1216
// NOTE: Do not place your application dependencies here; they belong
@@ -18,6 +22,10 @@ allprojects {
1822
repositories {
1923
jcenter()
2024
maven { url 'https://jitpack.io' }
25+
maven {
26+
url 'https://maven.google.com/'
27+
name 'Google'
28+
}
2129
}
2230
}
2331

‎APIJSON-Android/APIJSONApp/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Dec 28 10:00:20 PST 2015
1+
#Sat Feb 22 16:55:51 CST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)