-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from what3words/dev
1.0.3
- Loading branch information
Showing
12 changed files
with
210 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,67 @@ | ||
| plugins { | ||
| id 'com.android.library' | ||
| id 'org.jetbrains.kotlin.android' | ||
| id 'org.jetbrains.dokka' version '1.5.0' | ||
| id 'maven-publish' | ||
| id 'signing' | ||
| } | ||
|
|
||
| apply from: 'maven-push.gradle' | ||
| apply from: '../jacoco.gradle' | ||
|
|
||
| android { | ||
| compileSdk 33 | ||
|
|
||
| defaultConfig { | ||
| minSdk 24 | ||
| targetSdk 33 | ||
|
|
||
| testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
| consumerProguardFiles "consumer-rules.pro" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
|
|
||
| buildFeatures { | ||
| compose true | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||
| targetCompatibility JavaVersion.VERSION_1_8 | ||
| } | ||
| kotlinOptions { | ||
| jvmTarget = '1.8' | ||
| } | ||
| composeOptions { | ||
| kotlinCompilerExtensionVersion "1.3.1" | ||
| } | ||
| namespace 'com.what3words.design.library' | ||
| } | ||
|
|
||
| dependencies { | ||
|
|
||
| implementation 'androidx.core:core-ktx:1.7.0' | ||
| implementation 'com.google.android.material:material:1.6.1' | ||
| testImplementation 'junit:junit:4.13.2' | ||
| androidTestImplementation 'androidx.test.ext:junit:1.1.3' | ||
| androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' | ||
| implementation "androidx.compose.ui:ui:$compose_version" | ||
| implementation "androidx.compose.material:material:$compose_version" | ||
| implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" | ||
| implementation "androidx.constraintlayout:constraintlayout-compose:1.0.1" | ||
| debugImplementation "androidx.customview:customview:1.2.0-alpha02" | ||
| debugImplementation "androidx.customview:customview-poolingcontainer:1.0.0" | ||
| androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" | ||
| debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" | ||
| debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" | ||
| plugins { | ||
| id 'com.android.library' | ||
| id 'org.jetbrains.kotlin.android' | ||
| id 'org.jetbrains.dokka' version '1.5.0' | ||
| id 'maven-publish' | ||
| id 'signing' | ||
| } | ||
|
|
||
| apply from: 'maven-push.gradle' | ||
| apply from: '../jacoco.gradle' | ||
|
|
||
| android { | ||
| compileSdk 33 | ||
|
|
||
| defaultConfig { | ||
| minSdk 24 | ||
| targetSdk 33 | ||
|
|
||
| testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
| consumerProguardFiles "consumer-rules.pro" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
|
|
||
| buildFeatures { | ||
| compose true | ||
| } | ||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_8 | ||
| targetCompatibility JavaVersion.VERSION_1_8 | ||
| } | ||
| kotlinOptions { | ||
| jvmTarget = '1.8' | ||
| } | ||
| composeOptions { | ||
| kotlinCompilerExtensionVersion '1.4.6' | ||
| } | ||
| publishing { | ||
| singleVariant('release') { | ||
| withSourcesJar() | ||
| withJavadocJar() | ||
| } | ||
| } | ||
| namespace 'com.what3words.design.library' | ||
| } | ||
|
|
||
| dependencies { | ||
|
|
||
| implementation 'androidx.core:core-ktx:1.10.1' | ||
| testImplementation 'junit:junit:4.13.2' | ||
| androidTestImplementation 'androidx.test.ext:junit:1.1.5' | ||
| androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' | ||
| implementation "androidx.compose.ui:ui:$compose_version" | ||
| implementation "androidx.compose.material:material:$compose_version" | ||
| implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" | ||
| implementation "androidx.constraintlayout:constraintlayout-compose:1.0.1" | ||
| debugImplementation "androidx.customview:customview:1.2.0-alpha02" | ||
| debugImplementation "androidx.customview:customview-poolingcontainer:1.0.0" | ||
| androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version" | ||
| debugImplementation "androidx.compose.ui:ui-tooling:$compose_version" | ||
| debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.