diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle index f2dcb500caa..c947852f793 100644 --- a/src/android/jar/build.gradle +++ b/src/android/jar/build.gradle @@ -3,11 +3,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' + classpath 'com.android.tools.build:gradle:7.0.2' } } @@ -15,21 +15,20 @@ apply plugin: 'com.android.library' dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) -// implementation 'androidx.appcompat:appcompat:1.2.0' // for androidx } repositories { google() - jcenter() + mavenCentral() } android { - compileSdkVersion 30 - buildToolsVersion "30.0.3" + compileSdkVersion 31 + buildToolsVersion "31.0.3" defaultConfig { minSdkVersion 23 - targetSdkVersion 30 + targetSdkVersion 31 } sourceSets { diff --git a/src/network/android/jar/.gitignore b/src/network/android/jar/.gitignore new file mode 100644 index 00000000000..364420a59a1 --- /dev/null +++ b/src/network/android/jar/.gitignore @@ -0,0 +1,6 @@ +.gradle/ +build/ +gradle/ +gradlew +gradlew.bat +local.properties diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle new file mode 100644 index 00000000000..c947852f793 --- /dev/null +++ b/src/network/android/jar/build.gradle @@ -0,0 +1,53 @@ +// This is mainly used to allow Android Studio to easily read this folder as an android project. + +buildscript { + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.0.2' + } +} + +apply plugin: 'com.android.library' + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) +} + +repositories { + google() + mavenCentral() +} + +android { + compileSdkVersion 31 + buildToolsVersion "31.0.3" + + defaultConfig { + minSdkVersion 23 + targetSdkVersion 31 + } + + sourceSets { + main { + java.srcDir 'src/' + resources.srcDir 'libs/' + manifest.srcFile 'AndroidManifest.xml' + res.srcDirs = ['res/'] + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + android { + lintOptions { + abortOnError true + } + } +} diff --git a/src/network/android/jar/settings.gradle b/src/network/android/jar/settings.gradle new file mode 100644 index 00000000000..a5d909ed33f --- /dev/null +++ b/src/network/android/jar/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "QtAndroidNetwork" diff --git a/src/plugins/networkinformation/android/jar/.gitignore b/src/plugins/networkinformation/android/jar/.gitignore new file mode 100644 index 00000000000..364420a59a1 --- /dev/null +++ b/src/plugins/networkinformation/android/jar/.gitignore @@ -0,0 +1,6 @@ +.gradle/ +build/ +gradle/ +gradlew +gradlew.bat +local.properties diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle new file mode 100644 index 00000000000..c947852f793 --- /dev/null +++ b/src/plugins/networkinformation/android/jar/build.gradle @@ -0,0 +1,53 @@ +// This is mainly used to allow Android Studio to easily read this folder as an android project. + +buildscript { + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.0.2' + } +} + +apply plugin: 'com.android.library' + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) +} + +repositories { + google() + mavenCentral() +} + +android { + compileSdkVersion 31 + buildToolsVersion "31.0.3" + + defaultConfig { + minSdkVersion 23 + targetSdkVersion 31 + } + + sourceSets { + main { + java.srcDir 'src/' + resources.srcDir 'libs/' + manifest.srcFile 'AndroidManifest.xml' + res.srcDirs = ['res/'] + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + android { + lintOptions { + abortOnError true + } + } +} diff --git a/src/plugins/networkinformation/android/jar/settings.gradle b/src/plugins/networkinformation/android/jar/settings.gradle new file mode 100644 index 00000000000..cbb1ff361b5 --- /dev/null +++ b/src/plugins/networkinformation/android/jar/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "QtAndroidNetworkInformationBackend"