diff --git a/pkg/android/app/build.gradle b/pkg/android/app/build.gradle index f806add1..0c78c42f 100644 --- a/pkg/android/app/build.gradle +++ b/pkg/android/app/build.gradle @@ -1,16 +1,18 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { cppFlags "" + version '3.22.1' + arguments "-DZTS_ENABLE_JAVA=ON" } } ndk { @@ -28,15 +30,28 @@ android { externalNativeBuild { cmake { path "../../../CMakeLists.txt" + version '3.22.1' + } + } + + ndkVersion '25.1.8937393' + + namespace 'com.example.zerotier' + + sourceSets { + main { + java { + srcDir 'src/main/java' + srcDir '../../../src/bindings/java' + } } } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0-alpha3' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' - testImplementation 'junit:junit:4.12' + implementation 'com.android.support.constraint:constraint-layout:2.0.4' + testImplementation 'junit:junit:4.13.2' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } \ No newline at end of file diff --git a/pkg/android/app/src/main/AndroidManifest.xml b/pkg/android/app/src/main/AndroidManifest.xml index 53854075..0465e5bb 100644 --- a/pkg/android/app/src/main/AndroidManifest.xml +++ b/pkg/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/pkg/android/build.gradle b/pkg/android/build.gradle index fcafdd46..186f8f44 100644 --- a/pkg/android/build.gradle +++ b/pkg/android/build.gradle @@ -4,10 +4,10 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.3.1' // NOTE: Do not place your application dependencies here; they belong @@ -18,7 +18,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } }