Skip to content

Commit abcf4e5

Browse files
committed
更新gradle版本
1 parent 280db40 commit abcf4e5

File tree

136 files changed

+1501
-1522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+1501
-1522
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
# For more information about using CMake with Android Studio, read the
2-
# documentation: https://d.android.com/studio/projects/add-native-code.html
3-
4-
# Sets the minimum version of CMake required to build the native library.
5-
6-
cmake_minimum_required(VERSION 3.4.1)
7-
8-
# Creates and names a library, sets it as either STATIC
9-
# or SHARED, and provides the relative paths to its source code.
10-
# You can define multiple libraries, and CMake builds them for you.
11-
# Gradle automatically packages shared libraries with your APK.
12-
13-
add_library( # Sets the name of the library.
14-
serialport
15-
16-
# Sets the library as a shared library.
17-
SHARED
18-
19-
# Provides a relative path to your source file(s).
20-
src/main/cpp/com_chtj_base_iotutils_serialport_SerialPort.c)
21-
22-
# Searches for a specified prebuilt library and stores the path as a
23-
# variable. Because CMake includes system libraries in the search path by
24-
# default, you only need to specify the name of the public NDK library
25-
# you want to add. CMake verifies that the library exists before
26-
# completing its build.
27-
28-
find_library( # Sets the name of the path variable.
29-
log-lib
30-
31-
# Specifies the name of the NDK library that
32-
# you want CMake to locate.
33-
log )
34-
35-
# Specifies libraries CMake should link to your target library. You
36-
# can link multiple libraries, such as libraries you define in this
37-
# build script, prebuilt third-party libraries, or system libraries.
38-
39-
target_link_libraries( # Specifies the target library.
40-
serialport
41-
42-
# Links the target library to the log library
43-
# included in the NDK.
1+
# For more information about using CMake with Android Studio, read the
2+
# documentation: https://d.android.com/studio/projects/add-native-code.html
3+
4+
# Sets the minimum version of CMake required to build the native library.
5+
6+
cmake_minimum_required(VERSION 3.4.1)
7+
8+
# Creates and names a library, sets it as either STATIC
9+
# or SHARED, and provides the relative paths to its source code.
10+
# You can define multiple libraries, and CMake builds them for you.
11+
# Gradle automatically packages shared libraries with your APK.
12+
13+
add_library( # Sets the name of the library.
14+
serialport
15+
16+
# Sets the library as a shared library.
17+
SHARED
18+
19+
# Provides a relative path to your source file(s).
20+
src/main/cpp/com_chtj_base_iotutils_serialport_SerialPort.c)
21+
22+
# Searches for a specified prebuilt library and stores the path as a
23+
# variable. Because CMake includes system libraries in the search path by
24+
# default, you only need to specify the name of the public NDK library
25+
# you want to add. CMake verifies that the library exists before
26+
# completing its build.
27+
28+
find_library( # Sets the name of the path variable.
29+
log-lib
30+
31+
# Specifies the name of the NDK library that
32+
# you want CMake to locate.
33+
log )
34+
35+
# Specifies libraries CMake should link to your target library. You
36+
# can link multiple libraries, such as libraries you define in this
37+
# build script, prebuilt third-party libraries, or system libraries.
38+
39+
target_link_libraries( # Specifies the target library.
40+
serialport
41+
42+
# Links the target library to the log library
43+
# included in the NDK.
4444
${log-lib} )
Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ plugins {
77
}
88

99
android {
10+
namespace "com.face_chtj.base_iotutils"
1011
compileSdkVersion rootProject.ext.android.compileSdkVersion
1112

1213
defaultConfig {
13-
minSdkVersion rootProject.ext.android.minSdkVersion
14-
targetSdkVersion rootProject.ext.android.targetSdkVersion
14+
minSdk rootProject.ext.android.minSdkVersion
15+
targetSdk rootProject.ext.android.targetSdkVersion
1516
versionCode rootProject.ext.android.versionCode
1617
versionName rootProject.ext.android.versionName
1718
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -82,4 +83,10 @@ dependencies {
8283
api rootProject.ext.dependencies["converter-scalars"]
8384
}
8485

85-
86+
publishing {
87+
publications {
88+
release(MavenPublication) {
89+
artifactId = "BaseIotUtils"
90+
}
91+
}
92+
}

base_iotutils/src/androidTest/java/com/face_chtj/base_iotutils/ExampleInstrumentedTest.java renamed to BaseIotUtils/src/androidTest/java/com/face_chtj/base_iotutils/ExampleInstrumentedTest.java

File renamed without changes.
File renamed without changes.

base_iotutils/src/main/cpp/com_chtj_base_iotutils_serialport_SerialPort.c renamed to BaseIotUtils/src/main/cpp/com_chtj_base_iotutils_serialport_SerialPort.c

File renamed without changes.

base_iotutils/src/main/cpp/com_chtj_base_iotutils_serialport_SerialPort.h renamed to BaseIotUtils/src/main/cpp/com_chtj_base_iotutils_serialport_SerialPort.h

File renamed without changes.

base_iotutils/src/main/java/com/face_chtj/base_iotutils/AppsUtils.java renamed to BaseIotUtils/src/main/java/com/face_chtj/base_iotutils/AppsUtils.java

File renamed without changes.

0 commit comments

Comments
 (0)