Skip to content

Commit

Permalink
Add Gradle wrapper files (#6)
Browse files Browse the repository at this point in the history
* Add Gradle wrapper files

* Remove android.support flavor

* Remove signature

* Let define pomFile

* Remove signing
  • Loading branch information
Kevinrob authored Apr 9, 2024
1 parent ba2f5a0 commit 1006d25
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 169 deletions.
22 changes: 5 additions & 17 deletions demoapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ android {
}
}


flavorDimensions "androidx"
productFlavors{
library_androidx
//Note that this requires useAndroidx=false
library
}
lint {
abortOnError false
checkReleaseBuilds false
Expand All @@ -35,18 +28,13 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
//implementation project(path: ':library')
//library_androidxImplementation 'com.queue-it.androidsdk:library-androidx:2.0.34'
library_androidxImplementation project(path: ':library')
implementation project(path: ':library')
//libraryImplementation 'com.queue-it.androidsdk:library:2.0.34'
libraryImplementation project(path: ':library')

testImplementation 'junit:junit:4.13'

library_androidxImplementation 'androidx.appcompat:appcompat:1.2.0'
library_androidxImplementation 'androidx.constraintlayout:constraintlayout:2.0.4'
library_androidxImplementation 'androidx.navigation:navigation-fragment:2.3.3'
library_androidxImplementation 'androidx.navigation:navigation-ui:2.3.3'

libraryImplementation 'com.google.android.material:material:1.3.0'
//noinspection GradleCompatible
libraryImplementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.navigation:navigation-fragment:2.3.3'
implementation 'androidx.navigation:navigation-ui:2.3.3'
}
2 changes: 1 addition & 1 deletion demowithprotectedapi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
//Queue-it
//implementation project(path: ':library')
library_androidxImplementation project(path: ':library')
implementation project(path: ':library')

testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
Expand Down
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
13 changes: 2 additions & 11 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ android {
}
}


flavorDimensions "androidx"
productFlavors{
library_androidx
library
}
lint {
abortOnError false
}
Expand All @@ -44,11 +38,8 @@ dependencies {
testImplementation 'org.robolectric:robolectric:4.4'

implementation 'com.squareup.okhttp3:okhttp:4.9.2'
library_androidxApi 'androidx.appcompat:appcompat:1.2.0'
library_androidxApi 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'

//noinspection GradleCompatible
libraryImplementation 'com.android.support:appcompat-v7:28.0.0'
api 'androidx.appcompat:appcompat:1.2.0'
api 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
}

apply plugin: 'maven-publish'
Expand Down

This file was deleted.

This file was deleted.

16 changes: 8 additions & 8 deletions publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ afterEvaluate {
}

"$publicationName"(MavenPublication) {
from components."${variant.flavorName}Release"
from components."release"
artifactId variantArtifactId
group groupId
version libraryVersion
Expand All @@ -79,7 +79,7 @@ afterEvaluate {
// Create a signed pom if we need it
def pomFile = file("${project.buildDir}/generated-${variant.flavorName}-pom.xml")
writeTo(pomFile)
signing.sign(pomFile)
// signing.sign(pomFile)
}
}
}
Expand All @@ -93,12 +93,12 @@ if (rootProject.file("local.properties").exists()) {
}

//Sign all of our publications with our PGP private key
signing {
useInMemoryPgpKeys(PGP_KEY, PGP_PASSWORD)
publishing.publications.all { publication ->
sign(publication)
}
}
//signing {
// useInMemoryPgpKeys(PGP_KEY, PGP_PASSWORD)
// publishing.publications.all { publication ->
// sign(publication)
// }
//}

nexusPublishing {
repositories {
Expand Down

0 comments on commit 1006d25

Please sign in to comment.