diff --git a/.gitmodules b/.gitmodules index 9d3bc93..619f9a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "QtScrcpy/QtScrcpyCore"] path = QtScrcpy/QtScrcpyCore - url = git@github.com:barry-ran/QtScrcpyCore.git +url=git@github.com:WrBug/QtScrcpyCore.git diff --git a/QtScrcpy/QtScrcpyCore b/QtScrcpy/QtScrcpyCore index 9b81a31..923667c 160000 --- a/QtScrcpy/QtScrcpyCore +++ b/QtScrcpy/QtScrcpyCore @@ -1 +1 @@ -Subproject commit 9b81a312ad2e8157c48dc042e973a81702357509 +Subproject commit 923667c26c2422515964d7fb3a3c7acf4b5ff0e5 diff --git a/qtscrcpy-android/.gitignore b/qtscrcpy-android/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/qtscrcpy-android/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/qtscrcpy-android/.idea/.gitignore b/qtscrcpy-android/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/qtscrcpy-android/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/qtscrcpy-android/.idea/.name b/qtscrcpy-android/.idea/.name new file mode 100644 index 0000000..16de656 --- /dev/null +++ b/qtscrcpy-android/.idea/.name @@ -0,0 +1 @@ +qtscrcpy \ No newline at end of file diff --git a/qtscrcpy-android/.idea/compiler.xml b/qtscrcpy-android/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/qtscrcpy-android/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/.idea/gradle.xml b/qtscrcpy-android/.idea/gradle.xml new file mode 100644 index 0000000..f9ac467 --- /dev/null +++ b/qtscrcpy-android/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/.idea/misc.xml b/qtscrcpy-android/.idea/misc.xml new file mode 100644 index 0000000..bdd9278 --- /dev/null +++ b/qtscrcpy-android/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/.gitignore b/qtscrcpy-android/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/qtscrcpy-android/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/qtscrcpy-android/app/build.gradle b/qtscrcpy-android/app/build.gradle new file mode 100644 index 0000000..4911566 --- /dev/null +++ b/qtscrcpy-android/app/build.gradle @@ -0,0 +1,45 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace 'com.wrbug.qtscrcpy' + compileSdk 33 + + defaultConfig { + applicationId "com.wrbug.qtscrcpy" + minSdk 24 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation project(':server') +} \ No newline at end of file diff --git a/qtscrcpy-android/app/proguard-rules.pro b/qtscrcpy-android/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/qtscrcpy-android/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/qtscrcpy-android/app/src/androidTest/java/com/wrbug/qtscrcpy/ExampleInstrumentedTest.kt b/qtscrcpy-android/app/src/androidTest/java/com/wrbug/qtscrcpy/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..8df6150 --- /dev/null +++ b/qtscrcpy-android/app/src/androidTest/java/com/wrbug/qtscrcpy/ExampleInstrumentedTest.kt @@ -0,0 +1,25 @@ +package com.wrbug.qtscrcpy + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.wrbug.qtscrcpy", appContext.packageName) + } +} \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/AndroidManifest.xml b/qtscrcpy-android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..aa9f8d2 --- /dev/null +++ b/qtscrcpy-android/app/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/java/com/wrbug/qtscrcpy/MainActivity.kt b/qtscrcpy-android/app/src/main/java/com/wrbug/qtscrcpy/MainActivity.kt new file mode 100644 index 0000000..8a34f3f --- /dev/null +++ b/qtscrcpy-android/app/src/main/java/com/wrbug/qtscrcpy/MainActivity.kt @@ -0,0 +1,12 @@ +package com.wrbug.qtscrcpy + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle + +class MainActivity: AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + } +} \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/qtscrcpy-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..6107c77 --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/drawable/ic_launcher_background.xml b/qtscrcpy-android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..6b753e2 --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qtscrcpy-android/app/src/main/res/layout/activity_main.xml b/qtscrcpy-android/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..17eab17 --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml b/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/mipmap-anydpi-v33/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/qtscrcpy-android/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/qtscrcpy-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/qtscrcpy-android/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/qtscrcpy-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/qtscrcpy-android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/qtscrcpy-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/qtscrcpy-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/qtscrcpy-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/qtscrcpy-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/qtscrcpy-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/qtscrcpy-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/qtscrcpy-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/qtscrcpy-android/app/src/main/res/values-night/themes.xml b/qtscrcpy-android/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..ad54a4a --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/values/colors.xml b/qtscrcpy-android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/values/strings.xml b/qtscrcpy-android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..2a8813c --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + qtscrcpy + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/values/themes.xml b/qtscrcpy-android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..7887ec0 --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/xml/backup_rules.xml b/qtscrcpy-android/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/main/res/xml/data_extraction_rules.xml b/qtscrcpy-android/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/qtscrcpy-android/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/qtscrcpy-android/app/src/test/java/com/wrbug/qtscrcpy/ExampleUnitTest.kt b/qtscrcpy-android/app/src/test/java/com/wrbug/qtscrcpy/ExampleUnitTest.kt new file mode 100644 index 0000000..e3ea967 --- /dev/null +++ b/qtscrcpy-android/app/src/test/java/com/wrbug/qtscrcpy/ExampleUnitTest.kt @@ -0,0 +1,18 @@ +package com.wrbug.qtscrcpy + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/qtscrcpy-android/build.gradle b/qtscrcpy-android/build.gradle new file mode 100644 index 0000000..8a496f1 --- /dev/null +++ b/qtscrcpy-android/build.gradle @@ -0,0 +1,6 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.2.1' apply false + id 'com.android.library' version '7.2.1' apply false + id 'org.jetbrains.kotlin.android' version '1.8.0' apply false +} \ No newline at end of file diff --git a/qtscrcpy-android/gradle.properties b/qtscrcpy-android/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/qtscrcpy-android/gradle.properties @@ -0,0 +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. +org.gradle.jvmargs=-Xmx2048m -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 +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/qtscrcpy-android/gradle/wrapper/gradle-wrapper.jar b/qtscrcpy-android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/qtscrcpy-android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/qtscrcpy-android/gradle/wrapper/gradle-wrapper.properties b/qtscrcpy-android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..38494ac --- /dev/null +++ b/qtscrcpy-android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Jul 13 22:16:18 CST 2023 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/qtscrcpy-android/gradlew b/qtscrcpy-android/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/qtscrcpy-android/gradlew @@ -0,0 +1,185 @@ +#!/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. +# + +############################################################################## +## +## Gradle 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="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# 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/gradle/wrapper/gradle-wrapper.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 $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/qtscrcpy-android/gradlew.bat b/qtscrcpy-android/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/qtscrcpy-android/gradlew.bat @@ -0,0 +1,89 @@ +@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 Gradle 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 GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@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 execute + +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 execute + +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 + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/server/.gitignore b/qtscrcpy-android/server/.gitignore similarity index 100% rename from server/.gitignore rename to qtscrcpy-android/server/.gitignore diff --git a/server/build.gradle b/qtscrcpy-android/server/build.gradle similarity index 83% rename from server/build.gradle rename to qtscrcpy-android/server/build.gradle index dbc8261..36686cf 100644 --- a/server/build.gradle +++ b/qtscrcpy-android/server/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.genymobile.scrcpy" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 12400 versionName "1.24" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -23,4 +23,4 @@ dependencies { testImplementation 'junit:junit:4.13.1' } -apply from: "$project.rootDir/config/android-checkstyle.gradle" +//apply from: "$project.rootDir/config/android-checkstyle.gradle" diff --git a/server/build_without_gradle.sh b/qtscrcpy-android/server/build_without_gradle.sh similarity index 100% rename from server/build_without_gradle.sh rename to qtscrcpy-android/server/build_without_gradle.sh diff --git a/server/meson.build b/qtscrcpy-android/server/meson.build similarity index 100% rename from server/meson.build rename to qtscrcpy-android/server/meson.build diff --git a/server/proguard-rules.pro b/qtscrcpy-android/server/proguard-rules.pro similarity index 100% rename from server/proguard-rules.pro rename to qtscrcpy-android/server/proguard-rules.pro diff --git a/server/src/main/AndroidManifest.xml b/qtscrcpy-android/server/src/main/AndroidManifest.xml similarity index 100% rename from server/src/main/AndroidManifest.xml rename to qtscrcpy-android/server/src/main/AndroidManifest.xml diff --git a/server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl b/qtscrcpy-android/server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl similarity index 100% rename from server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl rename to qtscrcpy-android/server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl diff --git a/server/src/main/aidl/android/view/IRotationWatcher.aidl b/qtscrcpy-android/server/src/main/aidl/android/view/IRotationWatcher.aidl similarity index 100% rename from server/src/main/aidl/android/view/IRotationWatcher.aidl rename to qtscrcpy-android/server/src/main/aidl/android/view/IRotationWatcher.aidl diff --git a/server/src/main/java/com/genymobile/scrcpy/CleanUp.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/CleanUp.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/CleanUp.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/CleanUp.java diff --git a/server/src/main/java/com/genymobile/scrcpy/CodecOption.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/CodecOption.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/CodecOption.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/CodecOption.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Command.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Command.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Command.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Command.java diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/ControlMessage.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/ControlMessage.java diff --git a/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Controller.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Controller.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Controller.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Controller.java diff --git a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Device.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Device.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Device.java diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DeviceMessage.java diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DeviceMessageSender.java diff --git a/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DeviceMessageWriter.java diff --git a/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/DisplayInfo.java diff --git a/server/src/main/java/com/genymobile/scrcpy/IO.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/IO.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/IO.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/IO.java diff --git a/server/src/main/java/com/genymobile/scrcpy/InvalidDisplayIdException.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/InvalidDisplayIdException.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/InvalidDisplayIdException.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/InvalidDisplayIdException.java diff --git a/server/src/main/java/com/genymobile/scrcpy/InvalidEncoderException.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/InvalidEncoderException.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/InvalidEncoderException.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/InvalidEncoderException.java diff --git a/server/src/main/java/com/genymobile/scrcpy/KeyComposition.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/KeyComposition.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/KeyComposition.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/KeyComposition.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Ln.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Ln.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Ln.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Ln.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Options.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Options.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Options.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Options.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Point.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Point.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Point.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Point.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Pointer.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Pointer.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Pointer.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Pointer.java diff --git a/server/src/main/java/com/genymobile/scrcpy/PointersState.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/PointersState.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/PointersState.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/PointersState.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Position.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Position.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Position.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Position.java diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/ScreenEncoder.java diff --git a/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/ScreenInfo.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Server.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Server.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Server.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Settings.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Settings.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Settings.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Settings.java diff --git a/server/src/main/java/com/genymobile/scrcpy/SettingsException.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/SettingsException.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/SettingsException.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/SettingsException.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Size.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Size.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Size.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Size.java diff --git a/server/src/main/java/com/genymobile/scrcpy/StringUtils.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/StringUtils.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/StringUtils.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/StringUtils.java diff --git a/server/src/main/java/com/genymobile/scrcpy/Workarounds.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Workarounds.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/Workarounds.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/Workarounds.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/ActivityManager.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/ContentProvider.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/InputManager.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/PowerManager.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/ServiceManager.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/SurfaceControl.java diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java b/qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java similarity index 100% rename from server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java rename to qtscrcpy-android/server/src/main/java/com/genymobile/scrcpy/wrappers/WindowManager.java diff --git a/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java b/qtscrcpy-android/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java similarity index 100% rename from server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java rename to qtscrcpy-android/server/src/test/java/com/genymobile/scrcpy/CodecOptionsTest.java diff --git a/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java b/qtscrcpy-android/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java similarity index 100% rename from server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java rename to qtscrcpy-android/server/src/test/java/com/genymobile/scrcpy/ControlMessageReaderTest.java diff --git a/server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java b/qtscrcpy-android/server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java similarity index 100% rename from server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java rename to qtscrcpy-android/server/src/test/java/com/genymobile/scrcpy/DeviceMessageWriterTest.java diff --git a/server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java b/qtscrcpy-android/server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java similarity index 100% rename from server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java rename to qtscrcpy-android/server/src/test/java/com/genymobile/scrcpy/StringUtilsTest.java diff --git a/qtscrcpy-android/settings.gradle b/qtscrcpy-android/settings.gradle new file mode 100644 index 0000000..ccf5812 --- /dev/null +++ b/qtscrcpy-android/settings.gradle @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + maven { url 'https://maven.aliyun.com/repository/public/' } + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + maven { url 'https://maven.aliyun.com/repository/public/' } + google() + mavenCentral() + } +} +rootProject.name = "qtscrcpy" +include ':app',':server' diff --git a/server/scripts/build-wrapper.sh b/server/scripts/build-wrapper.sh deleted file mode 100644 index 7e16dc9..0000000 --- a/server/scripts/build-wrapper.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash -# Wrapper script to invoke gradle from meson -set -e - -# Do not execute gradle when ninja is called as root (it would download the -# whole gradle world in /root/.gradle). -# This is typically useful for calling "sudo ninja install" after a "ninja -# install" -if [[ "$EUID" == 0 ]] -then - echo "(not invoking gradle, since we are root)" >&2 - exit 0 -fi - -PROJECT_ROOT="$1" -OUTPUT="$2" -BUILDTYPE="$3" - -# gradlew is in the parent of the server directory -GRADLE=${GRADLE:-$PROJECT_ROOT/../gradlew} - -if [[ "$BUILDTYPE" == debug ]] -then - "$GRADLE" -p "$PROJECT_ROOT" assembleDebug - cp "$PROJECT_ROOT/build/outputs/apk/debug/server-debug.apk" "$OUTPUT" -else - "$GRADLE" -p "$PROJECT_ROOT" assembleRelease - cp "$PROJECT_ROOT/build/outputs/apk/release/server-release-unsigned.apk" "$OUTPUT" -fi