Skip to content

Commit

Permalink
Fix build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
akshaaatt committed Oct 26, 2021
1 parent 9fcd71d commit b7bb37c
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 42 deletions.
27 changes: 9 additions & 18 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
plugins {
id 'com.android.application'
id 'kotlin-android'
}

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"

compileSdk 31
defaultConfig {
applicationId "com.limerse.onboarding"
minSdkVersion 17
targetSdkVersion 30
minSdk 17
targetSdk 31
versionCode 1
versionName "1.0"
}
Expand All @@ -18,20 +18,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.appcompat:appcompat:1.3.1'

implementation project(':onboard')
implementation "androidx.core:core-ktx:1.5.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'androidx.core:core-ktx:1.6.0'
}
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:theme="@style/AppTheme">

<activity android:name="com.limerse.onboarding.IntroActivity">
<activity android:name="com.limerse.onboarding.IntroActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
buildscript {
ext.kotlin_version = '1.5.10'
ext.kotlin_version = '1.5.31'
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.1'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
2 changes: 2 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jdk:
- openjdk11
4 changes: 2 additions & 2 deletions local.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Mon Apr 26 21:24:24 IST 2021
sdk.dir=C\:\\Users\\tiwar\\AppData\\Local\\Android\\Sdk
#Wed Oct 27 04:13:53 IST 2021
sdk.dir=/Users/akshaaatt/Library/Android/sdk
45 changes: 29 additions & 16 deletions onboard/build.gradle
Original file line number Diff line number Diff line change
@@ -1,31 +1,44 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'maven-publish'
}

android {
compileSdkVersion 30
compileSdk 31

defaultConfig {
minSdkVersion 14
targetSdkVersion 30
versionCode 1
versionName "1.0.0"
minSdk 14
targetSdk 31

consumerProguardFiles 'consumer-proguard-rules.pro'
vectorDrawables.useSupportLibrary = true
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.annotation:annotation:1.2.0'
implementation 'com.airbnb.android:lottie:3.7.0'
implementation 'com.airbnb.android:lottie:4.2.0'

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.mockito:mockito-core:3.10.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
testImplementation 'org.mockito:mockito-core:4.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
}

afterEvaluate {
publishing {
publications {
// Creates a Maven publication called "release".
release(MavenPublication) {
// Applies the component for the release build variant.
from components.release

// You can then customize attributes of the publication as shown below.
groupId = 'com.limerse.onboard'
artifactId = 'final'
version = '1.0'
}
}
}
}

0 comments on commit b7bb37c

Please sign in to comment.