Skip to content

GitLab

Commit babe189f authored by pangcong Git's avatar pangcong Git
Browse files

打包配置修改

parent adaf846b
Hide whitespace changes
Inline Side-by-side
JCCGuestPlugin/build.gradle
View file @ babe189f
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
def prefix = "JCCGuestPlugin"
android { android {
compileSdkVersion rootProject.ext.android.compileSdkVersion compileSdkVersion rootProject.ext.android.compileSdkVersion
...@@ -7,7 +7,7 @@ android { ...@@ -7,7 +7,7 @@ android {
minSdkVersion rootProject.ext.android.minSdkVersion minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion
versionCode rootProject.ext.guest.versionCode versionCode rootProject.ext.guest.versionCode
versionName rootProject.ext.guest.versionName + "_hl" versionName rootProject.ext.guest.versionName
buildConfigField("int", "VERSION_CODE", "${defaultConfig.versionCode}") buildConfigField("int", "VERSION_CODE", "${defaultConfig.versionCode}")
buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"") buildConfigField("String", "VERSION_NAME", "\"${defaultConfig.versionName}\"")
} }
...@@ -42,6 +42,25 @@ android { ...@@ -42,6 +42,25 @@ android {
'src/main/java/manager', 'src/main/java/product'] 'src/main/java/manager', 'src/main/java/product']
} }
} }
libraryVariants.all { variant ->
variant.outputs.all {
def fileName = "${prefix}"
fileName = fileName + ".aar";
outputFileName = fileName
println("----------${fileName} 打包完成----------")
}
variant.assemble.doLast {
variant.outputs.all { output ->
def outputPath = [project.rootDir.absolutePath, "sdk", "sdk-output"].join(File.separator)
copy {
from output.outputFile
into outputPath
}
println("----------${outputPath} 复制完成----------")
}
}
}
} }
...@@ -55,13 +74,13 @@ android { ...@@ -55,13 +74,13 @@ android {
// } // }
//} //}
android.libraryVariants.configureEach { variant -> /*android.libraryVariants.configureEach { variant ->
variant.outputs.all { output -> variant.outputs.all { output ->
def versionName = android.defaultConfig.versionName // 获取版本名称 def versionName = android.defaultConfig.versionName // 获取版本名称
def newName = "JCCGuestPlugin_${versionName}.aar" def newName = "JCCGuestPlugin_${versionName}.aar"
output.outputFileName = newName output.outputFileName = newName
} }
} }*/
......
JRTCKit/build.gradle
View file @ babe189f
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
def prefix = "JRTCKit"
android { android {
compileSdkVersion rootProject.ext.android.compileSdkVersion compileSdkVersion rootProject.ext.android.compileSdkVersion
...@@ -7,7 +10,7 @@ android { ...@@ -7,7 +10,7 @@ android {
minSdkVersion rootProject.ext.android.minSdkVersion minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion
versionCode rootProject.ext.guest.versionCode versionCode rootProject.ext.guest.versionCode
versionName rootProject.ext.guest.versionName + "_hl" versionName rootProject.ext.guest.versionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
...@@ -30,16 +33,35 @@ android { ...@@ -30,16 +33,35 @@ android {
java.srcDirs = ['src/main/common','src/main/callcenter','src/main/room'] java.srcDirs = ['src/main/common','src/main/callcenter','src/main/room']
} }
} }
libraryVariants.all { variant ->
variant.outputs.all {
def fileName = "${prefix}"
fileName = fileName + ".aar";
outputFileName = fileName
println("----------${fileName} 打包完成----------")
}
variant.assemble.doLast {
variant.outputs.all { output ->
def outputPath = [project.rootDir.absolutePath, "sdk", "sdk-output"].join(File.separator)
copy {
from output.outputFile
into outputPath
}
println("----------${outputPath} 复制完成----------")
}
}
}
} }
task copyKitAar(type: Copy, dependsOn: ['assembleRelease']) { /*task copyKitAar(type: Copy, dependsOn: ['assembleRelease']) {
from('build/outputs/aar/JRTCKit-release.aar') from('build/outputs/aar/JRTCKit-release.aar')
into('../sdk/') into('../sdk/')
rename { String fileName -> //在复制时重命名文件 rename { String fileName -> //在复制时重命名文件
fileName = "JRTCKit.aar" // 重命名 fileName = "JRTCKit.aar" // 重命名
} }
} }*/
dependencies { dependencies {
compileOnly fileTree(dir: '../sdk', include: ['JRTCSDK.aar']) compileOnly fileTree(dir: '../sdk', include: ['JRTCSDK.aar'])
......
jetifier-standalone/bin/jetifier-standalone 0 → 100644
View file @ babe189f
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## jetifier-standalone start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/.." >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="jetifier-standalone"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and JETIFIER_STANDALONE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/lib/jetifier-standalone.jar:$APP_HOME/lib/jetifier-processor-1.0.0-beta10.jar:$APP_HOME/lib/commons-cli-1.3.1.jar:$APP_HOME/lib/jetifier-core-1.0.0-beta10.jar:$APP_HOME/lib/asm-util-8.0.1.jar:$APP_HOME/lib/asm-commons-8.0.1.jar:$APP_HOME/lib/asm-analysis-8.0.1.jar:$APP_HOME/lib/asm-tree-8.0.1.jar:$APP_HOME/lib/asm-8.0.1.jar:$APP_HOME/lib/jdom2-2.0.6.jar:$APP_HOME/lib/kotlin-stdlib-1.3.71.jar:$APP_HOME/lib/gson-2.8.0.jar:$APP_HOME/lib/kotlin-stdlib-common-1.3.71.jar:$APP_HOME/lib/annotations-13.0.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $JETIFIER_STANDALONE_OPTS -classpath "\"$CLASSPATH\"" com.android.tools.build.jetifier.standalone.Main "$APP_ARGS"
exec "$JAVACMD" "$@"
jetifier-standalone/bin/jetifier-standalone.bat 0 → 100644
View file @ babe189f
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem jetifier-standalone startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%..
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and JETIFIER_STANDALONE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\lib\jetifier-standalone.jar;%APP_HOME%\lib\jetifier-processor-1.0.0-beta10.jar;%APP_HOME%\lib\commons-cli-1.3.1.jar;%APP_HOME%\lib\jetifier-core-1.0.0-beta10.jar;%APP_HOME%\lib\asm-util-8.0.1.jar;%APP_HOME%\lib\asm-commons-8.0.1.jar;%APP_HOME%\lib\asm-analysis-8.0.1.jar;%APP_HOME%\lib\asm-tree-8.0.1.jar;%APP_HOME%\lib\asm-8.0.1.jar;%APP_HOME%\lib\jdom2-2.0.6.jar;%APP_HOME%\lib\kotlin-stdlib-1.3.71.jar;%APP_HOME%\lib\gson-2.8.0.jar;%APP_HOME%\lib\kotlin-stdlib-common-1.3.71.jar;%APP_HOME%\lib\annotations-13.0.jar
@rem Execute jetifier-standalone
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %JETIFIER_STANDALONE_OPTS% -classpath "%CLASSPATH%" com.android.tools.build.jetifier.standalone.Main %CMD_LINE_ARGS%
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable JETIFIER_STANDALONE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%JETIFIER_STANDALONE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
jetifier-standalone/bin/指令.txt 0 → 100644
View file @ babe189f
转androidx指令
JRTCKit.aar转androidx
!!!!!!!!指令：jetifier-standalone -i ../../sdk/sdk-output/JRTCKit.aar -o ../../sdk/sdk-output-x/JRTCKit.aar
JCCGuestPlugin.aar转androidx
!!!!!!!!指令：jetifier-standalone -i ../../sdk/sdk-output/JCCGuestPlugin.aar -o ../../sdk/sdk-output-x/JCCGuestPlugin.aar
源文件路径：项目根目录\sdk\sdk-output\
目标文件路径：项目根目录\sdk\sdk-output-x\
脚本路径：项目根目录\jetifier-standalone\bin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment