Add Gradle wrapper files (#6)

* Add Gradle wrapper files * Remove android.support flavor * Remove signature * Let define pomFile * Remove signing
qoqa · Apr 9, 2024 · 1006d25 · 1006d25
1 parent ba2f5a0
commit 1006d25
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 169 deletions.
diff --git a/demoapp/build.gradle b/demoapp/build.gradle
@@ -18,13 +18,6 @@ android {
         }
     }
 
-
-    flavorDimensions "androidx"
-    productFlavors{
-        library_androidx
-        //Note that this requires useAndroidx=false
-        library
-    }
     lint {
         abortOnError false
         checkReleaseBuilds false
@@ -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'
 }
diff --git a/demowithprotectedapi/build.gradle b/demowithprotectedapi/build.gradle
@@ -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'

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/library/build.gradle b/library/build.gradle
@@ -24,12 +24,6 @@ android {
         }
     }
 
-
-    flavorDimensions "androidx"
-    productFlavors{
-        library_androidx
-        library
-    }
     lint {
         abortOnError false
     }
@@ -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'

diff --git a/library/src/library/java/com/queue_it/androidsdk/QueueActivity.java b/library/src/library/java/com/queue_it/androidsdk/QueueActivity.java
diff --git a/library/src/library/java/com/queue_it/androidsdk/WaitingRoomStateBroadcaster.java b/library/src/library/java/com/queue_it/androidsdk/WaitingRoomStateBroadcaster.java
diff --git a/...om/queue_it/androidsdk/QueueActivity.java → ...om/queue_it/androidsdk/QueueActivity.java b/...om/queue_it/androidsdk/QueueActivity.java → ...om/queue_it/androidsdk/QueueActivity.java
diff --git a/...droidsdk/WaitingRoomStateBroadcaster.java → ...droidsdk/WaitingRoomStateBroadcaster.java b/...droidsdk/WaitingRoomStateBroadcaster.java → ...droidsdk/WaitingRoomStateBroadcaster.java
diff --git a/publish.gradle b/publish.gradle
@@ -60,7 +60,7 @@ afterEvaluate {
             }
 
             "$publicationName"(MavenPublication) {
-                from components."${variant.flavorName}Release"
+                from components."release"
                 artifactId variantArtifactId
                 group groupId
                 version libraryVersion
@@ -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)
                     }
                 }
             }
@@ -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 {