Skip to content

Commit 10180dc

Browse files
committed
Update gradle
1 parent b5dfd72 commit 10180dc

14 files changed

Lines changed: 104 additions & 61 deletions

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

androidhkdf/build.gradle

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
4-
apply plugin: 'com.github.dcendents.android-maven'
3+
apply plugin: 'maven-publish'
54

6-
group='com.github.TICESoftware'
5+
group = 'com.github.TICESoftware'
76

87
android {
9-
compileSdkVersion 30
10-
buildToolsVersion "29.0.3"
8+
compileSdkVersion 33
119

1210
defaultConfig {
1311
minSdkVersion 19
14-
targetSdkVersion 30
15-
versionCode 1
16-
versionName "1.2.0"
12+
targetSdkVersion 33
1713

1814
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1915
consumerProguardFiles 'consumer-rules.pro'
@@ -25,23 +21,49 @@ android {
2521
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2622
}
2723
}
28-
24+
namespace 'com.ticeapp.androidhkdf'
25+
kotlinOptions {
26+
jvmTarget = "17"
27+
}
28+
compileOptions {
29+
sourceCompatibility 17
30+
targetCompatibility 17
31+
}
32+
}
33+
afterEvaluate {
34+
publishing {
35+
publications {
36+
maven(MavenPublication) {
37+
groupId = 'com.ticeapp.androidhkdf'
38+
artifactId = 'androidhkdf'
39+
version = '1.1'
40+
artifact(bundleReleaseAar)
41+
}
42+
}
43+
}
2944
}
30-
3145
repositories {
3246
maven {
33-
url "https://dl.bintray.com/terl/lazysodium-maven"
47+
url "https://dl.bintray.com/terl/lazysodium-maven"
3448
}
3549
}
3650

3751
dependencies {
3852
implementation fileTree(dir: 'libs', include: ['*.jar'])
3953
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
40-
implementation 'androidx.appcompat:appcompat:1.2.0'
41-
implementation 'androidx.core:core-ktx:1.3.2'
42-
testImplementation 'junit:junit:4.13.1'
43-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
44-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
54+
implementation 'androidx.appcompat:appcompat:1.6.1'
55+
implementation 'androidx.core:core-ktx:1.10.1'
56+
testImplementation 'junit:junit:4.13.2'
57+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
58+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
4559
implementation "com.goterl:lazysodium-android:5.0.2@aar"
4660
implementation 'net.java.dev.jna:jna:5.8.0@aar'
4761
}
62+
63+
publishing.publications.all {
64+
artifactId 'androidhkdf'
65+
}
66+
67+
tasks.withType(PublishToMavenLocal) {
68+
dependsOn 'androidhkdf:bundleReleaseAar'
69+
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.ticeapp.androidhkdf" />
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" />

app/build.gradle

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
6-
compileSdkVersion 30
7-
buildToolsVersion "29.0.3"
5+
compileSdkVersion 33
86

97
defaultConfig {
108
applicationId "com.ticeapp.androidhkdfapp"
119
minSdkVersion 19
12-
targetSdkVersion 30
10+
targetSdkVersion 33
1311
versionCode 1
1412
versionName "1.0"
1513

@@ -22,24 +20,28 @@ android {
2220
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2321
}
2422
}
25-
23+
namespace 'com.ticeapp.androidhkdfapp'
24+
kotlinOptions {
25+
jvmTarget = "17"
26+
}
27+
compileOptions {
28+
sourceCompatibility 17
29+
targetCompatibility 17
30+
}
2631
}
27-
2832
repositories {
29-
maven {
30-
url "https://dl.bintray.com/terl/lazysodium-maven"
31-
}
33+
maven { url "https://dl.bintray.com/terl/lazysodium-maven" }
3234
}
3335

3436
dependencies {
3537
implementation fileTree(dir: 'libs', include: ['*.jar'])
3638
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
37-
implementation 'androidx.appcompat:appcompat:1.2.0'
38-
implementation 'androidx.core:core-ktx:1.3.2'
39-
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
40-
testImplementation 'junit:junit:4.13.1'
41-
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
42-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
39+
implementation 'androidx.appcompat:appcompat:1.6.1'
40+
implementation 'androidx.core:core-ktx:1.10.1'
41+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
42+
testImplementation 'junit:junit:4.13.2'
43+
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
44+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
4345
implementation project(":androidhkdf")
4446
implementation "com.goterl:lazysodium-android:5.0.2@aar"
4547
implementation 'net.java.dev.jna:jna:5.8.0@aar'

0 commit comments

Comments
 (0)