diff options
author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-30 14:56:03 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-06 16:28:07 +0000 |
commit | ae7db6abf00347b6600d7902cf3b1752e5b89a51 (patch) | |
tree | 25ab408efa4a163c906ea8cb5d17735cdcb93cf3 /src | |
parent | b4e6c46ad9de8ed751acbfeefa4b7ec5ce518e33 (diff) |
Android: Update and add missing gradle files for jar folders
Update the build.gradle for main Qt jar code, and add same files for
network and network information backend, so the code can be managed
from Android Studio.
This also adds .gitignore to ignore Android Studio build artefacts.
Change-Id: Ic06e9d12708070fad112f17e58b8754608d184f3
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit b02d88e416769857e56f310cdad7348767304b59)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/android/jar/build.gradle | 13 | ||||
-rw-r--r-- | src/network/android/jar/.gitignore | 6 | ||||
-rw-r--r-- | src/network/android/jar/build.gradle | 53 | ||||
-rw-r--r-- | src/network/android/jar/settings.gradle | 1 | ||||
-rw-r--r-- | src/plugins/networkinformation/android/jar/.gitignore | 6 | ||||
-rw-r--r-- | src/plugins/networkinformation/android/jar/build.gradle | 53 | ||||
-rw-r--r-- | src/plugins/networkinformation/android/jar/settings.gradle | 1 |
7 files changed, 126 insertions, 7 deletions
diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle index f2dcb500ca..c947852f79 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 0000000000..364420a59a --- /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 0000000000..c947852f79 --- /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 0000000000..a5d909ed33 --- /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 0000000000..364420a59a --- /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 0000000000..c947852f79 --- /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 0000000000..cbb1ff361b --- /dev/null +++ b/src/plugins/networkinformation/android/jar/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "QtAndroidNetworkInformationBackend" |