I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

checkin android build updates

Browse Source
This commit is contained in:
idk
2022-08-30 11:07:40 -04:00
parent 5824fd4efa
commit 9eec1d3348
7 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -3,3 +3,6 @@ signing.properties
.idea .idea
.idea/ .idea/
.gradle/ .gradle/
local.properties
override.properties
build

16
app/build.gradle
View File

@ -9,7 +9,7 @@ android {
defaultConfig { defaultConfig {
versionCode 4745270 versionCode 4745270
versionName "$I2P_ANDROID_VERSION" versionName "$I2P_ANDROID_VERSION"
minSdkVersion 14 minSdkVersion 21
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
// For Espresso // For Espresso
@ -31,15 +31,18 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7 coreLibraryDesugaringEnabled true
targetCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
} }
lintOptions { lintOptions {
abortOnError false abortOnError false
disable 'MissingDefaultResource' disable 'MissingDefaultResource'
} }
packagingOptions { packagingOptions {
exclude 'LICENSE.txt' resources {
excludes += ['LICENSE.txt']
}
} }
flavorDimensions 'tier' flavorDimensions 'tier'
productFlavors { productFlavors {
@ -56,7 +59,6 @@ android {
applicationId 'net.i2p.android.router' applicationId 'net.i2p.android.router'
} }
} }
buildToolsVersion '28.0.3'
} }
dependencies { dependencies {
@ -88,6 +90,10 @@ dependencies {
} }
} }
dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
}
project.ext.i2pbase = "../i2p.i2p" project.ext.i2pbase = "../i2p.i2p"
def Properties props = new Properties() def Properties props = new Properties()
def propFile = new File(project(':routerjars').projectDir, 'local.properties') def propFile = new File(project(':routerjars').projectDir, 'local.properties')

2
build.gradle
View File

@ -15,7 +15,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.0' classpath 'com.android.tools.build:gradle:4.2.2'
classpath 'com.android.tools.lint:lint-gradle:26.1.1' classpath 'com.android.tools.lint:lint-gradle:26.1.1'
} }
} }

4
gradle.properties
View File

@ -14,8 +14,8 @@ POM_DEVELOPER_ID=idk
POM_DEVELOPER_NAME=idk POM_DEVELOPER_NAME=idk
POM_DEVELOPER_EMAIL=hankhill19580@gmail.com POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
ANDROID_BUILD_TARGET_SDK_VERSION=30 ANDROID_BUILD_TARGET_SDK_VERSION=31
ANDROID_BUILD_SDK_VERSION=28 ANDROID_BUILD_SDK_VERSION=31
I2P_VERSION=1.9.0-1 I2P_VERSION=1.9.0-1
I2P_ANDROID_VERSION=1.9.0 I2P_ANDROID_VERSION=1.9.0

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

12
lib/client/build.gradle
View File

@ -9,7 +9,7 @@ repositories {
android { android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String) compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 21
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
} }
buildTypes { buildTypes {
@ -19,13 +19,17 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7 coreLibraryDesugaringEnabled true
targetCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
} }
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
buildToolsVersion '28.0.3' }
dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
} }
dependencies { dependencies {

12
lib/helper/build.gradle
View File

@ -5,7 +5,7 @@ version = '0.9.5'
android { android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String) compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
defaultConfig { defaultConfig {
minSdkVersion 14 minSdkVersion 21
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
} }
buildTypes { buildTypes {
@ -15,13 +15,13 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7 coreLibraryDesugaringEnabled true
targetCompatibility JavaVersion.VERSION_1_7 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
} }
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
buildToolsVersion '28.0.3'
} }
dependencies { dependencies {
@ -33,4 +33,8 @@ dependencies {
testImplementation 'org.mockito:mockito-core:2.11.0' testImplementation 'org.mockito:mockito-core:2.11.0'
} }
dependencies {
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
}
apply from: "${project.rootDir}/gradle/maven-push.gradle" apply from: "${project.rootDir}/gradle/maven-push.gradle"