Skip to content

Commit 48c0a53

Browse files
committed
update library
1 parent d36e707 commit 48c0a53

File tree

12 files changed

+77
-57
lines changed

12 files changed

+77
-57
lines changed

.idea/.gitignore

Lines changed: 3 additions & 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/jarRepositories.xml

Lines changed: 10 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: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

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

.idea/runConfigurations.xml

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

app/build.gradle

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
1+
plugins {
2+
id 'com.android.application'
3+
id 'kotlin-android'
4+
}
45

56
android {
6-
compileSdkVersion 30
7+
compileSdk 30
78
defaultConfig {
89
applicationId "omega_r.com.extensions.simple"
9-
minSdkVersion 14
10+
minSdkVersion 16
1011
targetSdkVersion 30
1112
versionCode 1
1213
versionName "1.0"
@@ -23,17 +24,28 @@ android {
2324
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2425
}
2526
}
27+
28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_1_8
30+
targetCompatibility JavaVersion.VERSION_1_8
31+
}
32+
kotlinOptions{
33+
jvmTarget = "1.8"
34+
}
35+
namespace 'omega_r.com.extensions.simple'
36+
2637
}
2738

2839
dependencies {
2940
implementation fileTree(dir: 'libs', include: ['*.jar'])
30-
implementation project(':extensionslib')
31-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
41+
implementation project(path: ':extensionslib')
42+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3243
implementation "androidx.appcompat:appcompat:$appcompat"
44+
implementation 'androidx.core:core-ktx:1.2.0'
3345
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
3446
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
3547

36-
testImplementation 'junit:junit:4.13.1'
37-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
38-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
48+
testImplementation 'junit:junit:4.+'
49+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
50+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
3951
}

build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.4.10'
4+
ext.kotlin_version = '1.6.21'
55
ext.appcompat = '1.2.0'
66

77
repositories {
8+
gradlePluginPortal()
89
google()
9-
jcenter()
10+
mavenCentral()
11+
maven { url 'https://jitpack.io'}
1012

1113
}
1214
dependencies {
13-
classpath 'com.android.tools.build:gradle:4.1.1'
15+
classpath 'com.android.tools.build:gradle:7.4.2'
1416
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
15-
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1617
// NOTE: Do not place your application dependencies here; they belong
1718
// in the individual module build.gradle files
1819
}
@@ -21,8 +22,12 @@ buildscript {
2122
allprojects {
2223
repositories {
2324
google()
25+
mavenCentral()
2426
jcenter()
25-
27+
maven { url 'https://jitpack.io' }
28+
maven {
29+
url "https://oss.sonatype.org/content/repositories/snapshots"
30+
}
2631
}
2732
}
2833

extensionslib/build.gradle

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'com.github.dcendents.android-maven'
1+
plugins {
2+
id 'com.android.library'
3+
id 'kotlin-android'
4+
}
45

56
android {
6-
compileSdkVersion 30
7+
compileSdk 30
78

89
defaultConfig {
9-
minSdkVersion 14
10+
minSdkVersion 16
1011
targetSdkVersion 30
11-
versionCode 1
12-
versionName "1.0"
1312

1413
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1514

@@ -25,22 +24,28 @@ android {
2524
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2625
}
2726
}
28-
kotlinOptions {
29-
freeCompilerArgs = ["-Xinline-classes"]
27+
28+
compileOptions {
29+
sourceCompatibility JavaVersion.VERSION_1_8
30+
targetCompatibility JavaVersion.VERSION_1_8
31+
}
32+
kotlinOptions{
33+
jvmTarget = "1.8"
3034
}
35+
36+
namespace 'com.omega_r.libs.extensions'
3137
}
3238

3339
dependencies {
3440
implementation fileTree(dir: 'libs', include: ['*.jar'])
35-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
41+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
42+
implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"
3643
implementation "androidx.appcompat:appcompat:$appcompat"
44+
implementation 'androidx.core:core-ktx:1.6.0'
3745
implementation 'androidx.recyclerview:recyclerview:1.1.0'
3846
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
3947

40-
testImplementation 'junit:junit:4.13.1'
41-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
42-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
43-
}
44-
repositories {
45-
mavenCentral()
48+
testImplementation 'junit:junit:4.+'
49+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
50+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
4651
}

0 commit comments

Comments
 (0)