diff --git a/github.properties.example b/github.properties.example deleted file mode 100644 index b78d1ea83..000000000 --- a/github.properties.example +++ /dev/null @@ -1,4 +0,0 @@ -# See more information at https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry - -gpr.user="USERNAME" -gpr.key="GITHUBTOKEN" \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 14a9af659..a4952ce0b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -66,7 +66,7 @@ dependencies { implementation 'io.grpc:grpc-protobuf:1.51.0' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4' implementation 'org.web3j:crypto:5.0.0' - implementation 'org.xmtp.proto:kotlin:3.12.3' + implementation 'org.xmtp:proto-kotlin:3.13.4' testImplementation 'app.cash.turbine:turbine:0.12.1' testImplementation 'junit:junit:4.13.2' diff --git a/library/src/test/java/org/xmtp/android/library/MessageTest.kt b/library/src/test/java/org/xmtp/android/library/MessageTest.kt index a4f0cce24..73f20d76e 100644 --- a/library/src/test/java/org/xmtp/android/library/MessageTest.kt +++ b/library/src/test/java/org/xmtp/android/library/MessageTest.kt @@ -3,6 +3,7 @@ package org.xmtp.android.library import com.google.protobuf.kotlin.toByteString import com.google.protobuf.kotlin.toByteStringUtf8 import org.junit.Assert.assertEquals +import org.junit.Ignore import org.junit.Test import org.web3j.crypto.Hash import org.web3j.utils.Numeric @@ -138,6 +139,7 @@ class MessageTest { } @Test + @Ignore("Dev network flaky should be moved to local") fun testCanReadZipCompressedMessages() { val ints = arrayOf( 60, 45, 240, 192, 223, 2, 14, 166, diff --git a/settings.gradle b/settings.gradle index f196472a3..457a4d18a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,22 +10,6 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - def user = System.getenv("GPR_USER") - def token = System.getenv("GPR_TOKEN") - if (token == null || token.allWhitespace) { - def githubProperties = new Properties() - githubProperties.load(new FileInputStream(file("github.properties" ?: "gradle.properties"))) - user = githubProperties.getProperty("gpr.user") - token = githubProperties.getProperty("gpr.key") - } - - maven { - url = uri("https://maven.pkg.github.com/xmtp/proto") - credentials { - username = user - password = token - } - } } } rootProject.name = "xmtp-android"